Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:29:23 +0000 (11:29 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:29:23 +0000 (11:29 +0200)

Trivial merge