Merge commit 'v2.6.36-rc3' into x86/memblock
commitdaab7fc734a53fdeaf844b7c03053118ad1769da
authorIngo Molnar <mingo@elte.hu>
Tue, 31 Aug 2010 07:45:21 +0000 (31 09:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 31 Aug 2010 07:45:46 +0000 (31 09:45 +0200)
tree575deb3cdcc6dda562acaed6f7c29bc81ae01cf2
parent774ea0bcb27f57b6fd521b3b6c43237782fed4b9
parent2bfc96a127bc1cc94d26bfaa40159966064f9c8c
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>
21 files changed:
arch/microblaze/mm/init.c
arch/powerpc/kernel/paca.c
arch/powerpc/kernel/rtas.c
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/mm/fsl_booke_mmu.c
arch/powerpc/mm/init_64.c
arch/powerpc/mm/numa.c
arch/powerpc/mm/tlb_nohash.c
arch/x86/Kconfig
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/head32.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/trampoline.c
arch/x86/mm/init_64.c
arch/x86/xen/mmu.c
arch/x86/xen/setup.c
include/linux/mm.h
kernel/Makefile
mm/page_alloc.c