Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:04:25 +0000 (13:04 +0100)
commit3abee3526d381e33a391362b01dc8b17d377076d
tree48e049e8df0a9059133672dd7bf4e0e4871f00a1
parent550cf00dbc8ee402bef71628cb71246493dd4500
parent45d9c273b262cde84bb6bb3fc02c01d07da76936
parent765031668fb2b064aebd9a568e5ad794cbe3413a
parent9e87f22ac6353b50425c5da412fe2418a48e25a3
Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/usbhid/hid-quirks.c