Merge branches 'wiimote' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 24 Aug 2011 14:41:52 +0000 (16:41 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 24 Aug 2011 14:41:52 +0000 (16:41 +0200)

Trivial merge