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)

Trivial merge