]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 02:49:05 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 02:49:05 +0000 (12:49 +1000)
commit2e41d47055e0e65943db6b0449b191f8e29d577f
treed08ebaf1f1abce1c57480d7eea6c3b3f9275e4e0
parent170ead09f68b6198db163d43efa38892c98c24cf
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