Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes' and...
authorJiri Kosina <jkosina@suse.cz>
Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 24 Jul 2012 11:39:00 +0000 (13:39 +0200)

Trivial merge