Merge remote branch 'linus/master' into x86/bootmem
H. Peter Anvin [Thu, 11 Feb 2010 00:55:28 +0000 (16:55 -0800)]
1  2 
arch/mips/mm/init.c
arch/score/mm/init.c
arch/x86/kernel/e820.c
arch/x86/kernel/setup.c
arch/x86/mm/ioremap.c
include/linux/mm.h
kernel/resource.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge