Merge branch 'linus' into x86/mm

x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

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