]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:03:14 +0000 (11:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 00:03:14 +0000 (11:03 +1100)
commitb53b00ca0f4b6de0f2106041d41ab99c02b17303
treed18b0942034a5ac45e8994d0c96d27a985e0d5d2
parent77903541ada63b7c41c00cb0bb9b113f7aa65f85
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c