diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-07 13:53:17 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-07 13:53:17 +0200 |
| commit | 882aba01052476cbe3cd7339a3e6784b2437f18d (patch) | |
| tree | ca1b55ccac08db5edc5d141432e776f49dc2584b | |
| parent | ddf28352b80c86754a6424e3a61e8bdf9213b3c7 (diff) | |
| parent | 9086617ea3a7f3e574ca64392b827bdd56f607eb (diff) | |
| parent | 35d851df23b093ee027f827fed2213ae5e88fc7a (diff) | |
Merge branches 'upstream-fixes' and 'magicmouse' into for-linus