| commit | daab7fc734a53fdeaf844b7c03053118ad1769da | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Tue Aug 31 09:45:21 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Tue Aug 31 09:45:46 2010 +0200 |
| tree | 575deb3cdcc6dda562acaed6f7c29bc81ae01cf2 | |
| parent | 774ea0bcb27f57b6fd521b3b6c43237782fed4b9 [diff] | |
| parent | 2bfc96a127bc1cc94d26bfaa40159966064f9c8c [diff] |
Merge commit 'v2.6.36-rc3' into x86/memblock Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>