kevin/linux
1
Fork 0
Code
72e58063d6
linux/drivers/input/keyboard
History
Linus Torvalds 72e58063d6 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (50 commits)
  davinci: fix remaining board support after io_pgoffst removal
  davinci: mityomapl138: make file local data static
  arm/davinci: remove duplicated include
  davinci: Initial support for Omapl138-Hawkboard
  davinci: MityDSP-L138/MityARM-1808 read MAC address from I2C Prom
  davinci: add tnetv107x touchscreen platform device
  input: add driver for tnetv107x touchscreen controller
  davinci: add keypad config for tnetv107x evm board
  davinci: add tnetv107x keypad platform device
  input: add driver for tnetv107x on-chip keypad controller
  net: davinci_emac: cleanup unused cpdma code
  net: davinci_emac: switch to new cpdma layer
  net: davinci_emac: separate out cpdma code
  net: davinci_emac: cleanup unused mdio emac code
  omap: cleanup unused davinci mdio arch code
  davinci: cleanup mdio arch code and switch to phy_id
  net: davinci_emac: switch to new mdio
  omap: add mdio platform devices
  davinci: add mdio platform devices
  net: davinci_emac: separate out davinci mdio
  ...

Fix up trivial conflict in drivers/input/keyboard/Kconfig (two entries
added next to each other - one from the davinci merge, one from the
input merge)
2010-10-25 10:59:31 -07:00
..
aaed2000_kbd.c
adp5520-keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
adp5588-keys.c Input: adp5588-keys - use more obvious i2c_device_id name string 2010-10-18 17:48:11 -07:00
amikbd.c m68k: amiga - Keyboard platform device conversion 2010-05-26 19:51:09 +02:00
atakbd.c
atkbd.c Input: atkbd - release previously reserved keycodes 248 - 254 2010-02-26 00:23:59 -08:00
bf54x-keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
davinci_keyscan.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ep93xx_keypad.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
gpio_keys.c Input: gpio_keys - add hooks to enable/disable device 2010-08-03 19:45:31 -07:00
hil_kbd.c Input: hil_kbd - add missing MODULE_DEVICE_TABLE() 2010-10-13 07:49:05 -07:00
hilkbd.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
hpps2atkbd.h
imx_keypad.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jornada680_kbd.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jornada720_kbd.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-10-25 10:59:31 -07:00
lkkbd.c Input: lkkbd - change formatting style to match the rest of the kernel 2009-10-13 23:58:20 -07:00
lm8323.c Merge commit 'v2.6.35-rc3' into next 2010-06-30 15:07:09 -07:00
locomokbd.c [ARM] locomo: avoid unnecessary cascaded keyboard IRQ 2010-03-02 07:40:49 +08:00
Makefile Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-10-25 10:59:31 -07:00
maple_keyb.c sh: maple: Support block reads and writes. 2009-02-27 16:07:32 +09:00
matrix_keypad.c Input: matrix_keypad - add support for clustered irq 2010-06-10 12:33:59 -07:00
max7359_keypad.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
mcs_touchkey.c Input: mcs - Add MCS touchkey driver 2010-07-04 01:23:26 -07:00
newtonkbd.c
nomadik-ske-keypad.c Input: add support for Nomadik SKE keypad controller 2010-10-13 07:49:24 -07:00
omap4-keypad.c Input: omap4-keypad - wake-up on events & long presses 2010-10-13 07:49:26 -07:00
omap-keypad.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
opencores-kbd.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pxa27x_keypad.c ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts 2010-10-09 17:07:19 +08:00
pxa930_rotary.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
qt2160.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
samsung-keypad.c Input: samsung-keypad - Add samsung keypad driver 2010-07-21 00:49:06 -07:00
sh_keysc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
stmpe-keypad.c input: Add STMPE keypad driver 2010-08-12 11:27:56 +02:00
stowaway.c
sunkbd.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
tca6416-keypad.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
tnetv107x-keypad.c input: add driver for tnetv107x on-chip keypad controller 2010-09-24 07:40:31 -07:00
twl4030_keypad.c Input: twl4030_keypad - fix error handling path 2010-10-13 07:49:24 -07:00
w90p910_keypad.c Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi' 2010-07-19 21:42:56 -07:00
xtkbd.c