| commit | a7153258b70ccbe3922fcee9ca4271d4f4c2bc55 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Sat Jan 08 01:08:19 2011 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Sat Jan 08 01:08:19 2011 +0100 |
| tree | 12e17027af36846933908da64a1419491ea58676 | |
| parent | ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 [diff] | |
| parent | 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c [diff] |
Merge branches 'upstream' and 'upstream-fixes' into for-linus