diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 14:32:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 14:32:16 -0500 |
| commit | 2989950cea13711f0cc573c26cde8fe08a36be03 (patch) | |
| tree | 33d7f099beb7167c2a404fc4e444bd15769e715a /MAINTAINERS | |
| parent | b1286f4e9ac14c8973140b338b4d3c5691264d3b (diff) | |
| parent | 0a9995e46f3f9cb28360c89892b939420ac3fa2e (diff) | |
Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC Non-critical bug fixes from Olof Johansson:
"Simple bug fixes that were not considered important enough for
inclusion into 3.7, especially those that arrived late during the
merge window.
There's also a MAINTAINERS update for the Renesas platforms in here,
marking Simon Horman as a maintainer and changing the git url to his
tree."
* tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
Update ARM/SHMOBILE section of MAINTAINERS
ARM: Fix Kconfig symbols typo for LEDS
ARM: pxa: add dummy SA1100 rtc clock in pxa25x
ARM: pxa: fix pxa25x gpio wakeup setting
ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
ARM: cns3xxx: drop unnecessary symbol selection
ARM: vexpress: fix ll debug code when building multiplatform
ARM: OMAP4: retrigger localtimers after re-enabling gic
ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.
ARM: OMAP4: PM: add errata support
ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init()
ARM: davinci: uncompress.h: bail out if uart not initialized
ARM: davinci: serial.h: fix uart number in the comment
ARM: davinci: dm644x evm: move pointer dereference below NULL check
ARM: vexpress: Make the debug UART detection more specific
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae56d94a7d35..8959cec4436d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1130,12 +1130,12 @@ S: Maintained | |||
| 1130 | F: drivers/media/platform/s5p-tv/ | 1130 | F: drivers/media/platform/s5p-tv/ |
| 1131 | 1131 | ||
| 1132 | ARM/SHMOBILE ARM ARCHITECTURE | 1132 | ARM/SHMOBILE ARM ARCHITECTURE |
| 1133 | M: Paul Mundt <lethal@linux-sh.org> | 1133 | M: Simon Horman <horms@verge.net.au> |
| 1134 | M: Magnus Damm <magnus.damm@gmail.com> | 1134 | M: Magnus Damm <magnus.damm@gmail.com> |
| 1135 | L: linux-sh@vger.kernel.org | 1135 | L: linux-sh@vger.kernel.org |
| 1136 | W: http://oss.renesas.com | 1136 | W: http://oss.renesas.com |
| 1137 | Q: http://patchwork.kernel.org/project/linux-sh/list/ | 1137 | Q: http://patchwork.kernel.org/project/linux-sh/list/ |
| 1138 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest | 1138 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next |
| 1139 | S: Supported | 1139 | S: Supported |
| 1140 | F: arch/arm/mach-shmobile/ | 1140 | F: arch/arm/mach-shmobile/ |
| 1141 | F: drivers/sh/ | 1141 | F: drivers/sh/ |