]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'wiimote' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 7 Sep 2011 11:26:34 +0000 (13:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 7 Sep 2011 11:26:34 +0000 (13:26 +0200)
commit3d43ea5ae11ca50fa1a6e9e37d6434b77de25c5a
tree41e7d8f2410da79912cc9dc89611a6743901358d
parentd5e86890eda5eae9d0cd23caaec11abdc12a8998
parentb22e00f3ece8f8ca9d7b9772d750db380e742bbb
Merge branch 'wiimote' into 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