]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 01:42:39 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 01:42:39 +0000 (11:42 +1000)
commit2be6ede151e06cf76c4e9ab34bfff442ea774dca
treed58edc27aedf0fa60a21502175f3b953da882812
parent44cd2e803ebf9e58b0f645b87fa44a8c9b4cf00f
parentd5e86890eda5eae9d0cd23caaec11abdc12a8998
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/Kconfig
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c