Merge branch 'merge' into powerpc-next
authorPaul Mackerras <paulus@samba.org>
Fri, 23 May 2008 06:53:23 +0000 (16:53 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 23 May 2008 06:53:23 +0000 (16:53 +1000)
1  2 
arch/powerpc/sysdev/mpic.c
drivers/net/Kconfig
include/asm-powerpc/mpic.h

Simple merge
Simple merge
Simple merge