]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'input/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 01:13:16 +0000 (12:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 01:13:16 +0000 (12:13 +1100)
commit0942e2827757cc94c76be062681f96867f434dd3
tree812f81d116e4d207a2d90b19766aefb2c3b12f4d
parent01e593e133431ef09392c2542430547f0dd3d5fd
parente23ed600baf1df4819d5ba44240a3b7d555e6de2
Merge remote-tracking branch 'input/next'

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