Merge from Linus' tree.
authorPaul Mackerras <paulus@samba.org>
Sun, 25 Sep 2005 12:51:50 +0000 (22:51 +1000)
committerPaul Mackerras <paulus@samba.org>
Sun, 25 Sep 2005 12:51:50 +0000 (22:51 +1000)
commite5baa396af7560382d2cf3f0871d616b61fc284c
tree6afc166894b8c8b3b2cf6add72a726be14ae2443
parentd6a4c847e43c851cc0ddf73087a730227223f989
parentef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1
Merge from Linus' tree.
arch/ppc/kernel/Makefile
arch/ppc/kernel/perfmon.c
arch/ppc/platforms/pmac_setup.c
arch/ppc64/Makefile
arch/ppc64/kernel/pSeries_iommu.c
arch/ppc64/kernel/pmac_setup.c
arch/ppc64/kernel/pmac_time.c
arch/ppc64/mm/hash_native.c