Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 22 Jul 2011 20:47:08 +0000 (22:47 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 22 Jul 2011 20:47:08 +0000 (22:47 +0200)

Trivial merge