]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 02:43:08 +0000 (12:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 02:43:08 +0000 (12:43 +1000)
commit901318f9456b1b6f0fd4fe219354758fa713861c
tree6881992059f3c0ecf6dd8e4f07240ce62a5c31bb
parent0b02653e68fbf975dae376cd2af90afe962f4136
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