diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-05 16:20:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-05 16:20:02 -0400 |
| commit | c4aed353b1b079eb4843e6a708fc68b4b28f72aa (patch) | |
| tree | c8f8136680cccc32a27203a8c6a9795f2b20e8f0 /drivers/input/keyboard/pxa27x_keypad.c | |
| parent | 6bc51545da17614c3fd0fc782c0847c154a2c207 (diff) | |
| parent | e15ebe05cce44c5164dbf8489841c18a887bcfc2 (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Small fixes on multiple ARM platforms
- A build regression from a previous fix on dove and mv78xx0
- Two fixes for recently (3.5-rc1) changed mmp/pxa code
- multiple omap2+ bug fixes
- two trivial fixes for i.MX
- one v3.5 regression for mxs"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: apx4devkit: fix FEC enabling PHY clock
ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4
ARM: OMAP4: hwmod data: temporarily comment out data for the usb_host_fs and aess IP blocks
ARM: Orion: Fix WDT compile for Dove and MV78xx0
ARM: mmp: remove mach/gpio-pxa.h
ARM: imx: assert SCC gate stays enabled
ARM: OMAP4: TWL6030: ensure sys_nirq1 is mux'd and wakeup enabled
ARM: OMAP2: Overo: init I2C before MMC to fix MMC suspend/resume failure
ARM: imx27_visstrim_m10: Do not include <asm/system.h>
ARM: pxa: hx4700: Fix basic suspend/resume
Diffstat (limited to 'drivers/input/keyboard/pxa27x_keypad.c')
0 files changed, 0 insertions, 0 deletions