1
0
Fork 0
alistair23-linux/include/linux/input
Linus Torvalds 31b6ca0af7 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: (58 commits)
  Input: wacom_w8001 - support pen or touch only devices
  Input: wacom_w8001 - use __set_bit to set keybits
  Input: bu21013_ts - fix misuse of logical operation in place of bitop
  Input: i8042 - add Acer Aspire 5100 to the Dritek list
  Input: wacom - add support for digitizer in Lenovo W700
  Input: psmouse - disable the synaptics extension on OLPC machines
  Input: psmouse - fix up Synaptics comment
  Input: synaptics - ignore bogus mt packet
  Input: synaptics - add multi-finger and semi-mt support
  Input: synaptics - report clickpad property
  input: mt: Document interface updates
  Input: fix double equality sign in uevent
  Input: introduce device properties
  hid: egalax: Add support for Wetab (726b)
  Input: include MT library as source for kerneldoc
  MAINTAINERS: Update input-mt entry
  hid: egalax: Add support for Samsung NB30 netbook
  hid: egalax: Document the new devices in Kconfig
  hid: egalax: Add support for Wetab
  hid: egalax: Convert to MT slots
  ...

Fixed up trivial conflict in drivers/input/keyboard/Kconfig
2011-01-07 14:45:47 -08:00
..
ad714x.h Input: add Analog Devices AD714x captouch input driver 2010-04-13 23:27:16 -07:00
adxl34x.h Input: adxl34x - add support for ADXL346 orientation sensing 2010-06-25 08:55:15 -07:00
bu21013.h Input: add ROHM BU21013 touch panel controller support 2010-10-13 07:49:27 -07:00
cma3000.h Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cy8ctmg110_pdata.h Input: cy8ctmg110 - capacitive touchscreen support 2010-07-31 02:37:17 -07:00
eeti_ts.h Input: eeti_ts - allow active high irq lines 2009-08-12 01:09:50 -07:00
matrix_keypad.h Keyboard: omap-keypad: use matrix_keypad.h 2010-12-22 11:11:47 -08:00
mt.h input: mt: Move tracking and pointer emulation to input-mt 2010-12-16 10:41:38 +01:00
sh_keysc.h Input: sh_keysc - update the driver with mode 6 2010-02-10 23:04:18 -08:00
sparse-keymap.h Input: add generic support for sparse keymaps 2009-12-07 09:26:35 -08:00
tps6507x-ts.h input: Touchscreen driver for TPS6507x 2010-05-28 01:37:38 +02:00