Merge branch 'core/debugobjects' into core/urgent
authorThomas Gleixner <tglx@linutronix.de>
Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 22 Jan 2009 09:03:02 +0000 (10:03 +0100)
1  2 
init/Kconfig
kernel/sysctl.c

diff --cc init/Kconfig
Simple merge
diff --cc kernel/sysctl.c
Simple merge