2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 19:53:59 +08:00
linux-next/drivers/input
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
..
gameport Freezer: make kernel threads nonfreezable by default 2007-07-17 10:23:02 -07:00
joystick Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2007-10-12 21:27:47 -04:00
keyboard Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2007-10-15 13:41:39 -07:00
misc Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 2007-10-12 15:49:37 -07:00
mouse Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2007-10-15 13:41:39 -07:00
serio Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2007-10-12 21:27:47 -04:00
tablet Input: wacom - add support for the new Bamboo tablets 2007-07-10 00:35:17 -04:00
touchscreen Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2007-10-15 13:41:39 -07:00
evbug.c Input: rework handle creation code 2007-04-12 01:29:46 -04:00
evdev.c Input: use full RCU API 2007-10-13 15:46:55 -04:00
ff-core.c Input: force feedback - make sure effect is present before playing 2007-05-03 00:51:10 -04:00
ff-memless.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
fixp-arith.h Input: move fixp-arith.h to drivers/input 2006-07-19 01:40:14 -04:00
input-polldev.c Input: polled device power saving 2007-09-26 00:01:25 -04:00
input.c Input: use full RCU API 2007-10-13 15:46:55 -04:00
joydev.c Input: use full RCU API 2007-10-13 15:46:55 -04:00
Kconfig Input: remove tsdev interface 2007-10-13 00:38:52 -04:00
Makefile Input: remove tsdev interface 2007-10-13 00:38:52 -04:00
mousedev.c Input: use full RCU API 2007-10-13 15:46:55 -04:00