Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
commit447753d97764b0ae3969936ec495e794baa88052
tree4db7e848aab1891349b34bc173b6626ffc999f44
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d
parent6c857730438cceb56a94ade3029899f52adf3b90
parent24985cf68612a5617d396b0b188cec807641cde1
parent9db630b48a99adb4156e205b812fba8959644280
Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c