q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/input/keyboard
History
Linus Torvalds dbe950f201 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
  Input: tc3589x-keypad - add missing kerneldoc
  Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages
  Input: ucb1400_ts - convert to threaded IRQ
  Input: ucb1400_ts - drop inline annotations
  Input: usb1400_ts - add __devinit/__devexit section annotations
  Input: ucb1400_ts - set driver owner
  Input: ucb1400_ts - convert to use dev_pm_ops
  Input: psmouse - make sure we do not use stale methods
  Input: evdev - do not block waiting for an event if fd is nonblock
  Input: evdev - if no events and non-block, return EAGAIN not 0
  Input: evdev - only allow reading events if a full packet is present
  Input: add driver for pixcir i2c touchscreens
  Input: samsung-keypad - implement runtime power management support
  Input: tegra-kbc - report wakeup key for some platforms
  Input: tegra-kbc - add device tree bindings
  Input: add driver for AUO In-Cell touchscreens using pixcir ICs
  Input: mpu3050 - configure the sampling method
  Input: mpu3050 - ensure we enable interrupts
  Input: mpu3050 - add of_match table for device-tree probing
  Input: sentelic - document the latest hardware
  ...

Fix up fairly trivial conflicts (device tree matching conflicting with
some independent cleanups) in drivers/input/keyboard/samsung-keypad.c
2012-01-10 10:55:52 -08:00
..
adp5520-keys.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
adp5588-keys.c Merge branch 'next' into for-linus 2011-10-26 21:46:20 -07:00
adp5589-keys.c Input: adp5589-keys - add support for the ADP5585 derivatives 2011-10-18 21:26:55 -07:00
amikbd.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
atakbd.c input/atari: Fix atarimouse init 2011-05-19 18:19:11 +02:00
atkbd.c Input: convert obsolete strict_strtox to kstrtox 2011-11-09 21:23:26 -08:00
bf54x-keys.c Input: keyboard - staticise non-exported symbols 2011-12-12 00:03:00 -08:00
davinci_keyscan.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
ep93xx_keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
gpio_keys.c Input: gpio_keys - use of_property_read_u32() 2011-09-20 22:46:32 -07:00
gpio_keys_polled.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08: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 Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
jornada680_kbd.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
jornada720_kbd.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
Kconfig Input: samsung-keypad - enable compiling on other platforms 2011-11-15 09:46:14 -08: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 Input: convert obsolete strict_strtox to kstrtox 2011-11-09 21:23:26 -08:00
locomokbd.c [ARM] locomo: avoid unnecessary cascaded keyboard IRQ 2010-03-02 07:40:49 +08:00
Makefile Input: tca8418_keypad - initial driver release 2011-10-29 12:32:24 -07:00
maple_keyb.c sh: maple: Support block reads and writes. 2009-02-27 16:07:32 +09:00
matrix_keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
max7359_keypad.c Input: max7359 - convert to dev_pm_ops 2011-02-21 01:02:30 -08:00
mcs_touchkey.c Input: mcs_touchkey - add shutdown handler 2011-02-23 21:43:38 -08:00
mpr121_touchkey.c Input: mpr121 - improve sensibility of touch key 2011-06-29 01:32:49 -07:00
newtonkbd.c
nomadik-ske-keypad.c Input: keyboard - staticise non-exported symbols 2011-12-12 00:03:00 -08:00
omap-keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
omap4-keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
opencores-kbd.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
pmic8xxx-keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
pxa27x_keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
pxa930_rotary.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
qt1070.c Input: qt1070 - remove obsolete cleanup for clientdata 2011-06-21 04:31:53 -07:00
qt2160.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
samsung-keypad.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-01-10 10:55:52 -08:00
sh_keysc.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
spear-keyboard.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
stmpe-keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
stowaway.c
sunkbd.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
tc3589x-keypad.c Input: tc3589x-keypad - add missing kerneldoc 2012-01-04 22:20:09 -08:00
tca6416-keypad.c Input: tca6416-keypad - suspend/resume wakeup support 2011-03-15 23:18:28 -07:00
tca8418_keypad.c Input: tca8418_keypad - initial driver release 2011-10-29 12:32:24 -07:00
tegra-kbc.c Input: tegra-kbc - report wakeup key for some platforms 2011-12-30 00:27:00 -08:00
tnetv107x-keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
twl4030_keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
w90p910_keypad.c Input: keyboard - use macro module_platform_driver() 2011-11-30 23:41:41 -08:00
xtkbd.c