Merge remote branch 'origin/master' into next

author Benjamin Herrenschmidt <benh@kernel.crashing.org>

Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)

committer Benjamin Herrenschmidt <benh@kernel.crashing.org>

Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
author Benjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
committer Benjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/kernel/prom.c
Simple merge
diff --cc arch/powerpc/mm/mem.c
Simple merge
diff --cc arch/powerpc/sysdev/mpic.c
Simple merge
author	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
committer	Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/mpic.c	patch \|	diff1 \|	diff2 \|	blob \| history