tree ca1b55ccac08db5edc5d141432e776f49dc2584b
parent ddf28352b80c86754a6424e3a61e8bdf9213b3c7
parent 9086617ea3a7f3e574ca64392b827bdd56f607eb
parent 35d851df23b093ee027f827fed2213ae5e88fc7a
author Jiri Kosina <jkosina@suse.cz> 1315396397 +0200
committer Jiri Kosina <jkosina@suse.cz> 1315396397 +0200

Merge branches 'upstream-fixes' and 'magicmouse' into for-linus