]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:35:29 +0000 (10:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:35:29 +0000 (10:35 +1100)
commitfb35433240593d18d4468dd04c42b156db12b821
tree0c3c5d340fe5cfb23280214b366b83a664a905b8
parent45239dbcfeb078ce89180116d55473ed3b2f87ad
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c