| commit | d2137d5af4259f50c19addb8246a186c9ffac325 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Feb 14 11:55:18 2011 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Feb 14 11:55:18 2011 +0100 |
| tree | 2f7e309f9cf8ef2f2698532c226edda38021fe69 | |
| parent | f005fe12b90c5b9fe180a09209a893e09affa8aa [diff] | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 [diff] |
Merge branch 'linus' into x86/bootmem
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:
e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()
Signed-off-by: Ingo Molnar <mingo@elte.hu>