Merge branch 'linus' into x86/mm
Thomas Gleixner [Wed, 17 Feb 2010 17:27:37 +0000 (18:27 +0100)]
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>

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