]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:06:02 +0000 (14:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 03:06:02 +0000 (14:06 +1100)
commit43c5ece798155e31899f722adad6d5c639d15116
tree5678ac5390a57dddd1001c9a438dfb95dcc70364
parent40ae1a29c6b5dfba3f8d4f5656032c4e14a4831f
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