]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 01:12:24 +0000 (12:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 01:12:24 +0000 (12:12 +1100)
commitc38f3779c5d32e6ccf7d627db71143346cc0b522
treeaec464ca61391cdf3d08ebdb211f63453b349b15
parentfb2c3087b174a25b8180afcfff97cd1d4d5d03ce
parent59bae1db71942dcf91bb7e4938989606095536b5
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.c
drivers/input/touchscreen/ads7846.c