1
0
Fork 0
alistair23-linux/arch/arm/plat-spear/include/plat
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
..
clkdev.h ARM: 6014/1: ST SPEAr: Added clock framework for SPEAr platform and machines 2010-04-14 11:34:33 +01:00
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
gpio.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00
io.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00
keyboard.h Input: add support for keyboards on ST SPEAr platform 2010-11-19 12:43:25 -08:00
memory.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00
padmux.h ARM: 6020/1: ST SPEAr: Adding gpio pad multiplexing support 2010-04-14 11:34:38 +01:00
shirq.h ARM: 6091/1: ST SPEAr: Adding support for shared irq layer 2010-05-04 16:54:54 +01:00
system.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00
timex.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00
uncompress.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00
vmalloc.h ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform 2010-04-14 11:31:58 +01:00