Merge branch 'linus' into x86/mm
authorThomas Gleixner <tglx@linutronix.de>
Wed, 17 Feb 2010 17:27:37 +0000 (18:27 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 17 Feb 2010 17:28:05 +0000 (18:28 +0100)
commitb7e56edba4b02f2079042c326a8cd72a44635817
treeb5042002e9747cd8fb1278d61f86d8b92a74c018
parent13ca0fcaa33f6b1984c4111b6ec5df42689fea6f
parentb0483e78e5c4c9871fc5541875b3bc006846d46b
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>
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