]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:36:56 +0000 (13:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 02:36:56 +0000 (13:36 +1100)
commit6a2fae25932878d1f939221284bf9bca7a5acd73
treeb12798ced85b7fcacff280092f98f8e2075f7511
parent08c048192137b73ca451ad3541f6726d255f0d95
parent246835fccdc0dadeda20cd51f7ec868031fa8142
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c
drivers/input/keyboard/samsung-keypad.c
drivers/input/mouse/synaptics.c
drivers/input/tablet/wacom_wac.c