tree 48e049e8df0a9059133672dd7bf4e0e4871f00a1
parent 550cf00dbc8ee402bef71628cb71246493dd4500
parent 45d9c273b262cde84bb6bb3fc02c01d07da76936
parent 765031668fb2b064aebd9a568e5ad794cbe3413a
parent 9e87f22ac6353b50425c5da412fe2418a48e25a3
author Jiri Kosina <jkosina@suse.cz> 1332245065 +0100
committer Jiri Kosina <jkosina@suse.cz> 1332245065 +0100

Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linus