Merge branch 'core/debugobjects' into core/urgent

author Thomas Gleixner <tglx@linutronix.de>

Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)

committer Thomas Gleixner <tglx@linutronix.de>

Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
author Thomas Gleixner <tglx@linutronix.de>
Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
committer Thomas Gleixner <tglx@linutronix.de>
Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
diff --cc init/Kconfig
Simple merge
diff --cc kernel/sysctl.c
Simple merge
author	Thomas Gleixner <tglx@linutronix.de>
	Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
committer	Thomas Gleixner <tglx@linutronix.de>
	Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
		1	2
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history