]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Fri, 24 Sep 2010 12:03:37 +0000 (14:03 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 24 Sep 2010 12:03:37 +0000 (14:03 +0200)
1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-core.c

Simple merge
Simple merge
Simple merge