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