]> 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, 12 Oct 2011 01:45:10 +0000 (12:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 01:45:10 +0000 (12:45 +1100)
commit6a66b58e1335124cce69e10067043bfcbeaacc0b
tree3b831f7e3a53dce1de91a4a893364cdd66a60f88
parent39f969eb1f80657251fd1d0f6cfa879400000928
parent6ad6b268729e13fa9df0d352fe4b2b6313a5f912
Merge remote-tracking branch 'hid/for-next'

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