]> 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, 3 Oct 2012 01:47:51 +0000 (11:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:47:51 +0000 (11:47 +1000)
commita717dceb248c067db4da72a7dc5b8a2b6a8beb41
tree9a77837c9c6830181a043e0e7ed3661b911e0751
parent6bdb2dbf9da66f9c23a03633bfa969af04e20b26
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c