kevin/linux
1
Fork 0
Code
e3a66aa33a
linux/drivers/input/keyboard
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
adp5520-keys.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
adp5588-keys.c Input: adp5588 - add support for gpio names 2012-05-10 22:34:16 -07:00
adp5589-keys.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
amikbd.c Input: revert some over-zealous conversions to module_platform_driver() 2012-01-10 23:12:46 -08:00
atakbd.c
atkbd.c Input: atkbd - fix language in a printed message 2012-04-23 23:35:53 -07:00
bf54x-keys.c Input: keyboard - staticise non-exported symbols 2011-12-12 00:03:00 -08:00
davinci_keyscan.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
ep93xx_keypad.c ARM: ep93xx: move platform_data definitions 2012-09-14 11:16:55 +02:00
gpio_keys_polled.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
gpio_keys.c Input: gpio_keys - remove useless reinitialization of pdata->nbuttons 2012-06-12 00:38:15 -07:00
hil_kbd.c Input: serio - use module_serio_driver 2012-04-04 09:25:43 -07:00
hilkbd.c
hpps2atkbd.h
imx_keypad.c Input: imx_keypad - reset the hardware before enabling 2012-08-21 22:03:09 -07:00
jornada680_kbd.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
jornada720_kbd.c ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq 2012-03-25 23:57:19 +01:00
Kconfig Input: omap-keypad: Remove dependencies to mach includes 2012-09-12 18:06:30 -07:00
lkkbd.c Input: serio - use module_serio_driver 2012-04-04 09:25:43 -07:00
lm8323.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
lm8333.c lm8333: Fix check ordering 2012-06-27 17:35:55 +02:00
locomokbd.c
lpc32xx-keys.c Input: add support for key scan interface of the LPC32xx SoC 2012-07-17 23:16:16 -07:00
Makefile Input: add support for key scan interface of the LPC32xx SoC 2012-07-17 23:16:16 -07:00
maple_keyb.c
matrix_keypad.c Input: matrix-keymap - uninline and prepare for device tree support 2012-05-10 22:38:47 -07:00
max7359_keypad.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
mcs_touchkey.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
mpr121_touchkey.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
newtonkbd.c Input: serio - use module_serio_driver 2012-04-04 09:25:43 -07:00
nomadik-ske-keypad.c ARM: nomadik: move platform_data definitions 2012-09-14 11:19:00 +02:00
omap4-keypad.c Input: omap4-keypad - add device tree support 2012-07-17 23:16:07 -07:00
omap-keypad.c ARM: omap: move platform_data definitions 2012-09-19 17:39:52 +02:00
opencores-kbd.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
pmic8xxx-keypad.c Input: matrix-keymap - uninline and prepare for device tree support 2012-05-10 22:38:47 -07:00
pxa27x_keypad.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa930_rotary.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
qt1070.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
qt2160.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
samsung-keypad.c Input: matrix-keymap - uninline and prepare for device tree support 2012-05-10 22:38:47 -07:00
sh_keysc.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
spear-keyboard.c ARM: spear: move platform_data definitions 2012-09-19 17:42:19 +02:00
stmpe-keypad.c Input: matrix-keymap - uninline and prepare for device tree support 2012-05-10 22:38:47 -07:00
stowaway.c Input: serio - use module_serio_driver 2012-04-04 09:25:43 -07:00
sunkbd.c Input: serio - use module_serio_driver 2012-04-04 09:25:43 -07:00
tc3589x-keypad.c Input: matrix-keymap - uninline and prepare for device tree support 2012-05-10 22:38:47 -07:00
tca6416-keypad.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
tca8418_keypad.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
tegra-kbc.c Input: tegra-kbc - add clk_prepare/clk_unprepare 2012-06-12 10:32:31 -06:00
tnetv107x-keypad.c Input: request threaded-only IRQs with IRQF_ONESHOT 2012-07-04 13:12:19 -07:00
twl4030_keypad.c Input: matrix-keymap - uninline and prepare for device tree support 2012-05-10 22:38:47 -07:00
w90p910_keypad.c ARM: w90x900: move platform_data definitions 2012-09-14 11:18:59 +02:00
xtkbd.c Input: serio - use module_serio_driver 2012-04-04 09:25:43 -07:00