]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:48:18 +0000 (13:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:48:18 +0000 (13:48 +1100)
commitd86fbed5a0cb803827f5579a4e800630c67bd7e8
tree52610c40bef211f3fd6a1584f8091f391d59efdf
parent631af5ad9eb848a9ac869d1cc8635951cc114dae
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