projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f005fe1 795abaf)
Merge branch 'linus' into x86/bootmem
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Feb 2011 10:55:18 +0000 (11:55 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Feb 2011 10:55:18 +0000 (11:55 +0100)
commitd2137d5af4259f50c19addb8246a186c9ffac325
tree2f7e309f9cf8ef2f2698532c226edda38021fe69tree | snapshot
parentf005fe12b90c5b9fe180a09209a893e09affa8aacommit | diff
parent795abaf1e4e188c4171e3cd3dbb11a9fcacaf505commit | 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>
arch/x86/kernel/aperture_64.c diff1 | diff2 | blob | history
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
arch/x86/mm/amdtopology_64.c diff1 | diff2 | blob | history
arch/x86/mm/init.c diff1 | diff2 | blob | history
arch/x86/mm/numa_64.c diff1 | diff2 | blob | history
arch/x86/mm/srat_64.c diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.