Merge branches 'upstream-fixes' and 'magicmouse' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 7 Sep 2011 11:53:17 +0000 (13:53 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 7 Sep 2011 11:53:17 +0000 (13:53 +0200)

Trivial merge