]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:34:52 +0000 (13:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:34:52 +0000 (13:34 +1100)
commitefd768befa1aaf5bad23dcc5e925eeb724a4fbe8
treeb07770d794d2e3e5d0444e76eddd17d0a87c0f7a
parent0751a1270dbb408b11f6895a2f0ddb7a1aa99617
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