]> 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, 10 Oct 2012 23:01:15 +0000 (10:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 23:01:15 +0000 (10:01 +1100)
commit443fdf79d1ad5187fac8b9fc9b15296058b65bcd
tree604db73a560b01d1080d0e9cd4aef8b40527bb68
parentb8b3cfa850e262a9ea7ed00c17099fbd392f51af
parent0b824113b796e11d99f575429b089afc953ad1d5
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c