Merge remote branch 'origin/master' into next
Benjamin Herrenschmidt [Thu, 30 Jun 2011 05:23:59 +0000 (15:23 +1000)]
1  2 
MAINTAINERS
arch/powerpc/kernel/prom.c
arch/powerpc/mm/mem.c
arch/powerpc/sysdev/mpic.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge