]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:42:59 +0000 (10:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:42:59 +0000 (10:42 +1100)
commit21eb861e8b180fdbf67b0da631f754d0259278e3
treecb400a61d1c620db118017ce140ecd6fa7646258
parentc744241095cef072cd081d1a8bbaa1c12ed1b9d5
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c