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

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/mips/txx9/generic/Makefile b/arch/mips/txx9/generic/Makefile
new file mode 100644
index 000000000000..668fdaad6448
--- /dev/null
+++ b/arch/mips/txx9/generic/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for common code for TXx9 based systems
+#
+
+obj-y   += setup.o
+obj-$(CONFIG_PCI)       += pci.o
+obj-$(CONFIG_SOC_TX4927)        += mem_tx4927.o irq_tx4927.o
+obj-$(CONFIG_SOC_TX4938)        += mem_tx4938.o irq_tx4938.o
+obj-$(CONFIG_TOSHIBA_FPCIB0)    += smsc_fdc37m81x.o
+obj-$(CONFIG_KGDB)      += dbgio.o
+
+EXTRA_CFLAGS += -Werror