Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
Jiri Kosina [Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)]
1  2  3  4 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c

Simple merge
Simple merge
Simple merge
Simple merge