]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 02:08:25 +0000 (13:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Nov 2011 02:08:25 +0000 (13:08 +1100)
commite129903b1a149a24a96e26c34f5864cb1a555902
tree2ece2995c51c7e370c0ac1a4e60afff5d7f67600
parent439fbbbe8d9ddb2ece68d9519ea3eb5130cbb0a0
parent3d95fd6ad8d3cf582a70ed65660017114b6e4065
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c
drivers/input/input-polldev.c
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-spi.c
drivers/input/touchscreen/ad7879.c
drivers/input/touchscreen/ads7846.c