Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Fri, 25 Aug 2006 04:56:07 +0000 (14:56 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 25 Aug 2006 04:56:07 +0000 (14:56 +1000)
commitea0763a7e62f60f3e166327268a80f16ad806718
treede54ec5e5d5a49b3cba81b096b7572852aa6f5a9
parent271c511db9d37d6797745adb1f151a8bd2838c6f
parentc85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5
Merge branch 'merge'
15 files changed:
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/cpu_setup_ppc970.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/legacy_serial.c
arch/powerpc/kernel/machine_kexec_64.c
arch/powerpc/kernel/prom_parse.c
arch/powerpc/kernel/time.c
arch/powerpc/platforms/85xx/mpc85xx_ads.c
arch/powerpc/platforms/85xx/mpc85xx_cds.c
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
arch/powerpc/sysdev/fsl_soc.c
arch/powerpc/sysdev/tsi108_pci.c
include/asm-powerpc/system.h