]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 00:10:42 +0000 (11:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 00:10:42 +0000 (11:10 +1100)
commitba5759e19654b19a5a9342276411acdfca95c51e
tree8c75ec8e8957f594d874c310ba7234a476a8788f
parent6c2740f282cf5c8abe87f9f0710bef7b5510d264
parent59bae1db71942dcf91bb7e4938989606095536b5
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/Kconfig
drivers/input/keyboard/samsung-keypad.c
drivers/input/input-polldev.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/samsung-keypad.c
drivers/input/misc/adxl34x.c
drivers/input/misc/ati_remote2.c
drivers/input/mouse/elantech.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/ad7877.c
drivers/input/touchscreen/ad7879.c
drivers/input/touchscreen/ads7846.c