Merge remote branch 'linus/master' into x86/bootmem

diff --cc arch/mips/mm/init.c
Simple merge

diff --cc arch/score/mm/init.c
Simple merge

diff --cc arch/x86/kernel/e820.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/ioremap.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/resource.c
Simple merge