kevin/linux
1
Fork 0
Code
f2e1d89f9b
linux/drivers/input/touchscreen
History
Linus Torvalds f2e1d89f9b 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: (40 commits)
  Input: use full RCU API
  Input: remove tsdev interface
  Input: add support for Blackfin BF54x Keypad controller
  Input: appletouch - another fix for idle reset logic
  HWMON: hdaps - switch to using input-polldev
  Input: add support for SEGA Dreamcast keyboard
  Input: omap-keyboard - don't pretend we support changing keymap
  Input: lifebook - fix X and Y axis range
  Input: usbtouchscreen - add support for GeneralTouch devices
  Input: fix open count handling in input interfaces
  Input: keyboard - add CapsShift lock
  Input: adbhid - produce all CapsLock key events
  Input: ALPS - add signature for ThinkPad R61
  Input: jornada720_kbd - send MSC_SCAN events
  Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
  Input: add support for HP Jornada 7xx onboard keyboard
  Input: add support for HP Jornada onboard keyboard (HP6XX)
  Input: ucb1400_ts - use schedule_timeout_uninterruptible
  Input: xpad - fix dependancy on LEDS class
  Input: auto-select INPUT for MAC_EMUMOUSEBTN option
  ...

Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
a class device to a device and converting to use input-polldev created a
few apparently trivial clashes..
2007-10-15 13:41:39 -07:00
..
ads7846.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
corgi_ts.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
elo.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
fujitsu_ts.c Input: add driver for Fujitsu serial touchscreens 2007-07-18 00:37:01 -04:00
gunze.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
h3600_ts_input.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
hp680_ts_input.c input: hp680_ts compile fixes. 2007-05-14 09:18:35 +09:00
jornada720_ts.c Input: add support for the HP Jornada 7xx (710/720/728) touchscreen 2007-09-26 00:02:56 -04:00
Kconfig Input: usbtouchscreen - add support for GeneralTouch devices 2007-10-12 14:19:40 -04:00
Makefile Input: add support for the HP Jornada 7xx (710/720/728) touchscreen 2007-09-26 00:02:56 -04:00
mk712.c Input: touchscreens - handle errors when registering input devices 2006-11-05 22:40:03 -05:00
mtouch.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
penmount.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
touchright.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
touchwin.c Input: touchscreens - switch to using input_dev->dev.parent 2007-04-12 01:35:14 -04:00
ucb1400_ts.c Input: ucb1400_ts - use schedule_timeout_uninterruptible 2007-09-26 00:02:19 -04:00
usbtouchscreen.c Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2007-10-12 21:27:47 -04:00