]> 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, 13 Oct 2011 01:24:59 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 01:24:59 +0000 (12:24 +1100)
commitb9357a4d5c718a462932a97fcedda29ec5994851
treef0476c586fc78af031e9caa0dbe155287727404d
parent9c5f6b65118affc0b911e71e05fff66bde8aa688
parent6ad6b268729e13fa9df0d352fe4b2b6313a5f912
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-wacom.c
MAINTAINERS
drivers/hid/hid-wacom.c