Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Thu, 31 Aug 2006 05:45:48 +0000 (15:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 31 Aug 2006 05:45:48 +0000 (15:45 +1000)
commitaa43f77939c97bf9d3580c6a5e71a5a40290e451
tree095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d
parent2818c5dec5e28d65d52afbb7695bbbafe6377ee5
parent4c15343167b5febe7bb0ba96aad5bef42ae94d3b
Merge branch 'merge'
13 files changed:
arch/powerpc/Kconfig
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/prom_init.c
arch/powerpc/kernel/prom_parse.c
arch/powerpc/kernel/time.c
arch/powerpc/platforms/83xx/mpc834x_itx.c
arch/powerpc/platforms/83xx/mpc834x_sys.c
arch/powerpc/platforms/83xx/pci.c
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
drivers/net/spider_net.c
drivers/video/riva/fbdev.c
include/asm-powerpc/prom.h