| commit | b17304245f0db0ac69b795c411407808f3f2796d | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Sat Jan 10 12:04:41 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Jan 10 12:04:41 2009 +0100 |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 [diff] | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 [diff] |
Merge branch 'linus' into x86/setup-lzma Conflicts: init/do_mounts_rd.c