]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 01:46:35 +0000 (12:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 01:46:35 +0000 (12:46 +1100)
commit50880e791b8c0e0ba6184d8d176f103272acb3ac
treec1e19543a1b5ef028f7d9f5376f59f9e3e358eef
parent326f1e2653c8dcaa7b8106bfe4bfce97f55fe520
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