Merge commit 'origin/master'

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c
This commit is contained in:
Benjamin Herrenschmidt
2008-07-16 11:07:59 +10:00
941 changed files with 48176 additions and 76671 deletions

View File

@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/stacktrace.h>
#include <linux/module.h>
#include <asm/ptrace.h>
#include <asm/processor.h>