]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:59:16 +0000 (10:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:59:16 +0000 (10:59 +1100)
commitb479265663ebe76c9d0f6abb55d3720fc0cdb01d
tree1eea1d59f44b0ed860753be01bd2d2c68c31b379
parent822a3233cd8e9ef468e462b454ab0f1ee00f81fa
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c