author | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 26 Jan 2011 06:31:44 +0000 (16:31 +1000) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Wed, 26 Jan 2011 06:31:44 +0000 (16:31 +1000) |
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - pass touch resolution to clients through input_absinfo
Input: wacom - add 2 Bamboo Pen and touch models
Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup
Input: tegra-kbc - add tegra keyboard driver
Input: gpio_keys - switch to using request_any_context_irq
Input: serio - allow registered drivers to get status flag
Input: ct82710c - return proper error code for ct82c710_open
Input: bu21013_ts - added regulator support
Input: bu21013_ts - remove duplicate resolution parameters
Input: tnetv107x-ts - don't treat NULL clk as an error
Input: tnetv107x-keypad - don't treat NULL clk as an error
Fix up trivial conflicts in drivers/input/keyboard/Makefile due to
additions of tc3589x/Tegra drivers
Input: wacom - pass touch resolution to clients through input_absinfo
Input: wacom - add 2 Bamboo Pen and touch models
Input: sysrq - ensure sysrq_enabled and __sysrq_enabled are consistent
Input: sparse-keymap - fix KEY_VSW handling in sparse_keymap_setup
Input: tegra-kbc - add tegra keyboard driver
Input: gpio_keys - switch to using request_any_context_irq
Input: serio - allow registered drivers to get status flag
Input: ct82710c - return proper error code for ct82c710_open
Input: bu21013_ts - added regulator support
Input: bu21013_ts - remove duplicate resolution parameters
Input: tnetv107x-ts - don't treat NULL clk as an error
Input: tnetv107x-keypad - don't treat NULL clk as an error
Fix up trivial conflicts in drivers/input/keyboard/Makefile due to
additions of tc3589x/Tegra drivers
1 | 2 | |||
---|---|---|---|---|
drivers/input/keyboard/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/input/keyboard/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/tty/sysrq.c | patch | | diff1 | | diff2 | | blob | history |
kernel/sysctl.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/input/keyboard/Kconfig
Simple merge
diff --cc drivers/input/keyboard/Makefile
index 4e5571b72cda460ddda5363f1738dbeef2c103b7,3456b931e2547b5ed3cdd4ce977aa82c3b49a908..468c627a28447efb78b9fb32b9a35351719d4f06
obj-$(CONFIG_KEYBOARD_STMPE) += stmpe-keypad.o
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o
+obj-$(CONFIG_KEYBOARD_TC3589X) += tc3589x-keypad.o
+ obj-$(CONFIG_KEYBOARD_TEGRA) += tegra-kbc.o
obj-$(CONFIG_KEYBOARD_TNETV107X) += tnetv107x-keypad.o
obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o
obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
diff --cc drivers/tty/sysrq.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge