| commit | b22d8370061898f3029cdc2601fbdec493443f03 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Jul 23 15:26:10 2008 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Jul 23 15:26:10 2008 +0200 |
| tree | dae4b3859c5cf3ad0e2430ad7c11a1e8766f9b49 | |
| parent | 00b33277fa544676250d898fccea0a0255608e7f [diff] | |
| parent | 6a250778c79d6d14db9ed8e1f86f7b934e2bf3dc [diff] |
Merge branches 'upstream' and 'upstream-fixes' into for-linus