]> 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, 4 Apr 2013 00:09:38 +0000 (11:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:09:38 +0000 (11:09 +1100)
commit05c795b8fe63182346f03847cbc9f9f1ae376f7e
tree6cba95bcb9eaccc27ae7ae2b0c91a62c7abf9dea
parent173101d88aad8d9958d7e43dad84bead5219f367
parentac990a17b2ba08929a2fbc49aee177e31364a71d
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-multitouch.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c