]> err.no Git - linux-2.6/commit
Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Thu, 31 Jan 2008 00:25:51 +0000 (11:25 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 31 Jan 2008 00:25:51 +0000 (11:25 +1100)
commitbd45ac0c5daae35e7c71138172e63df5cf644cf6
tree5eb5a599bf6a9d7a8a34e802db932aa9e9555de4
parent4eece4ccf997c0e6d8fdad3d842e37b16b8d705f
parent5bdeae46be6dfe9efa44a548bd622af325f4bdb4
Merge branch 'linux-2.6'
24 files changed:
Documentation/kernel-parameters.txt
arch/powerpc/Kconfig
arch/powerpc/boot/Makefile
arch/powerpc/platforms/cell/spu_base.c
arch/powerpc/platforms/pasemi/Makefile
arch/powerpc/platforms/pasemi/pasemi.h
arch/powerpc/platforms/powermac/pic.c
arch/powerpc/sysdev/ipic.c
arch/powerpc/sysdev/mpic.c
arch/powerpc/sysdev/mv64x60_dev.c
arch/ppc/8260_io/enet.c
arch/ppc/syslib/open_pic.c
drivers/ata/Kconfig
drivers/ata/Makefile
drivers/ata/pata_mpc52xx.c
drivers/char/hw_random/pasemi-rng.c
drivers/macintosh/adb.c
drivers/macintosh/mediabay.c
drivers/macintosh/therm_windtunnel.c
drivers/macintosh/via-pmu.c
drivers/net/Kconfig
drivers/net/ibm_newemac/core.c
drivers/net/ucc_geth.c
include/asm-powerpc/ptrace.h