]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:01:03 +0000 (15:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 04:01:03 +0000 (15:01 +1100)
commit9594be47820291525ffb2345aaae4d7b4ec93d32
treec9600e421aafa80ce4c1cf3855270ea44dea3e98
parent6957da556e390036578d12afa53ca5281a969e72
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