Merge ../powerpc-merge
Paul Mackerras [Fri, 10 Feb 2006 05:51:29 +0000 (16:51 +1100)]
1  2 
arch/powerpc/platforms/powermac/setup.c
arch/powerpc/sysdev/dart_iommu.c

Simple merge