]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'wiimote' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 17 Sep 2012 15:24:14 +0000 (17:24 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 17 Sep 2012 15:24:14 +0000 (17:24 +0200)
commitb1353ddca07e06ef9a052096949cd0bd566ba355
treec748ef1770b7f228551a58fef914dc7db9be3992
parent2db6365fd03c3d9bd19e8f238d89aad30006359b
parent3155a09fd5060190eea4f2585d55d6c5431837c4
Merge branch 'wiimote' into for-next

Conflicts:
drivers/hid/usbhid/hid-quirks.c
drivers/hid/hid-core.c
drivers/hid/usbhid/hid-quirks.c