Merge ../powerpc-merge
authorPaul Mackerras <paulus@samba.org>
Fri, 10 Feb 2006 05:51:29 +0000 (16:51 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 10 Feb 2006 05:51:29 +0000 (16:51 +1100)
commitd6d93856cb90eeb07062ad938bd26f554bf1b9b9
treeeeec5011a42f38d3dfe7b61788b7ac1cc890edeb
parent8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d
parentad71f123a9e9b809f6c829db1222ce0423a1153c
Merge ../powerpc-merge
arch/powerpc/platforms/powermac/setup.c
arch/powerpc/sysdev/dart_iommu.c