author | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 7 Jan 2011 22:45:47 +0000 (14:45 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 7 Jan 2011 22:45:47 +0000 (14:45 -0800) |
* '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
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
1 | 2 | |||
---|---|---|---|---|
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
drivers/hid/hid-core.c | patch | | diff1 | | diff2 | | blob | history |
drivers/hid/hid-egalax.c | patch | | diff1 | | diff2 | | blob | history |
drivers/hid/hid-ids.h | patch | | diff1 | | diff2 | | blob | history |
drivers/input/input.c | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/input/misc/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/misc/Makefile | patch | | diff1 | | diff2 | | blob | history |
include/linux/input.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-egalax.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/input/input.c
Simple merge
diff --cc drivers/input/keyboard/Kconfig
index c76bd3183beb73aa115f6f28b9b8e53ed57bed01,e98beae23cfdd83064480d97bd6a827ef4c5892c..f829998fabe6b2358f08d30c49195d0656ac87a3
To compile this driver as a module, choose M here: the
module will be called omap4-keypad.
+ config KEYBOARD_SPEAR
+ tristate "ST SPEAR keyboard support"
+ depends on PLAT_SPEAR
+ help
+ Say Y here if you want to use the SPEAR keyboard.
+
+ To compile this driver as a module, choose M here: the
+ module will be called spear-keboard.
+
+config KEYBOARD_TC3589X
+ tristate "TC3589X Keypad support"
+ depends on MFD_TC3589X
+ help
+ Say Y here if you want to use the keypad controller on
+ TC35892/3 I/O expander.
+
+ To compile this driver as a module, choose M here: the
+ module will be called tc3589x-keypad.
+
config KEYBOARD_TNETV107X
tristate "TI TNETV107X keypad support"
depends on ARCH_DAVINCI_TNETV107X
diff --cc drivers/input/keyboard/Makefile
Simple merge
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/misc/Makefile
Simple merge
diff --cc include/linux/input.h
Simple merge