]> 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, 5 Sep 2011 03:54:36 +0000 (13:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 03:54:36 +0000 (13:54 +1000)
commit07b30b407eb04aec4e938b6358ba941aac05a7a1
tree5a34f93a5872fd11eb8ad94a129da2a20ed53941
parent53b2e47e70503bb0db7cd2119445d84b279bc5f7
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