Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat', ...
authorJiri Kosina <jkosina@suse.cz>
Thu, 17 Mar 2011 13:31:46 +0000 (14:31 +0100)
committerJiri Kosina <jkosina@suse.cz>
Thu, 17 Mar 2011 13:31:46 +0000 (14:31 +0100)

Trivial merge