]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:35:37 +0000 (12:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:35:37 +0000 (12:35 +1100)
commit141a2c7d551fea4ba63d865dee79797580c26f8f
treee93300faa82710f2302fc805ee88d9bd38b8818d
parent2549c6a485addf1056a49d626a8a3c53ec9c987a
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