Merge branches 'for-3.10/wiimote' and 'for-3.9/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:19:21 +0000 (10:19 +0200)
commitad1b890e06af049fb48d7ccb799d0e96c071c893
treed52f8e173cfaaf9e71fe4bb46259b3a3bb513088
parent047dff63f913c21c5228b94118e7996ab998cdc4
parent2d44e3d26891e9530e29395f5a86b751c2f69ee8
Merge branches 'for-3.10/wiimote' and 'for-3.9/upstream-fixes' into for-linus
drivers/hid/hid-core.c
drivers/hid/hid-ids.h