]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branches 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:44:36 +0000 (22:44 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:44:36 +0000 (22:44 +0200)
1  2  3 
drivers/hid/hid-core.c
drivers/hid/hid-debug.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/usbhid/hiddev.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge