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)
commitd446014162ed2ce1c5181b52c6d5f7492acbdade
tree6d0536b8c0cc3210ca672efdfb1d17f646b119f6
parentc87019e41d61f3f972bd2f6a2380fc9896e4ab74
parentf5e4282586dc0c9dab8c7d32e6c43aa07f68586b
Merge branches 'wiimote' and 'upstream-fixes' into for-linus