]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:18:45 +0000 (13:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 02:18:45 +0000 (13:18 +1100)
commitfe897aeaec3d66235de0c1da0d33d2a82dbbc4d2
tree7567a12df4a43bc83db09385849e0b166828bce8
parentf809e4a235ef119217b9bc64b57e45b61d1408a2
parente23ed600baf1df4819d5ba44240a3b7d555e6de2
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/samsung-keypad.c
drivers/input/keyboard/samsung-keypad.c