diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-29 12:25:23 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-29 12:25:23 -0700 |
| commit | a92e7023caf6c3a58b047a4c3fc9e4981b327bb8 (patch) | |
| tree | 44eb26c76f9c566295476c4c5cae0fa96a19d2f7 /arch/arm/mach-pxa | |
| parent | a99ab88815aec12bd257e121dee06003e2401a68 (diff) | |
| parent | 2533c2cfbff8f0ee53b8448d6362b54c272125aa (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
"This contains the updated gpio_to_irq patches from Tarun, and a trivial
build fix from Govindraj to #include <asm/system_misc.h> in pm.c.
The DSI mux patch is the same."
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: pm: fix compilation break
ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
ARM: OMAP2+: Remove __init from DSI mux functions
Diffstat (limited to 'arch/arm/mach-pxa')
0 files changed, 0 insertions, 0 deletions