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)
commit882aba01052476cbe3cd7339a3e6784b2437f18d
treeca1b55ccac08db5edc5d141432e776f49dc2584b
parentddf28352b80c86754a6424e3a61e8bdf9213b3c7
parent9086617ea3a7f3e574ca64392b827bdd56f607eb
parent35d851df23b093ee027f827fed2213ae5e88fc7a
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus