diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 20:32:16 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 20:32:16 +0100 |
commit | 2989950cea13711f0cc573c26cde8fe08a36be03 (patch) | |
tree | 33d7f099beb7167c2a404fc4e444bd15769e715a /arch/arm/mach-omap1/sleep.S | |
parent | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
parent | Merge branch 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/h... (diff) | |
download | linux-2989950cea13711f0cc573c26cde8fe08a36be03.tar.xz linux-2989950cea13711f0cc573c26cde8fe08a36be03.zip |
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 'arch/arm/mach-omap1/sleep.S')
0 files changed, 0 insertions, 0 deletions