]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 00:23:33 +0000 (11:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 00:23:33 +0000 (11:23 +1100)
commit64a2c199c159a63eb1e7a7c654bff0419b5e55ea
tree4a1ddbb723bea1839400a7b685b7f3502e77ca52
parent15df459452eceff123690d2fb4bd4cf1dd854915
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c