]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 02:11:29 +0000 (13:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 02:11:29 +0000 (13:11 +1100)
commitb7fa283d7a1704198343a23e3a65e6a79c7e819d
tree93d9f2f67b94db079b38138b0f85504d6530ded9
parent5d9f3a582c9f80954fb86f882b5f1e912730eba2
parenta6c61789c8499381a5fe612f11dc95d0b55e590a
Merge remote-tracking branch 'input/next'

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