]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit03428c7b7fed784e8b5f527d2a6921941008110d
tree095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d
parent7074b2c55c2961a6d999c81342c0d1bdf4f9fcbd
parent23bd9100950e4835b5c0a63aedf698316767d40a
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