]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 03:27:39 +0000 (14:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 03:27:39 +0000 (14:27 +1100)
commit8bc42ee6eec3cd7876b620a45703659a43c5d4c0
tree96102f93ba097fbd3ee5c6a8b27fa5b2bd61627f
parent2a50c5630db85d5a88e4aa57ce6f16fcbd9cefa5
parent6ad6b268729e13fa9df0d352fe4b2b6313a5f912
Merge remote-tracking branch 'hid/for-next'

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