]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a26961d dced5d4)
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)
commitaf6e3d09329309cdd040f545f25b1ec1817a9347
tree2f7e309f9cf8ef2f2698532c226edda38021fe69tree | snapshot
parenta26961dabfe80b219555589e34d3df2c4e41df49commit | diff
parentdced5d45a6b0c6cc913295ac0258eb61eca0b9edcommit | 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:

  410353b58986: 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
Linux Kernel Source Tree.