Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Tue, 8 May 2007 03:37:51 +0000 (13:37 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 8 May 2007 03:37:51 +0000 (13:37 +1000)
commit02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1
tree04ef573cd4de095c500c9fc3477f4278c0b36300
parent7487a2245b8841c77ba9db406cf99a483b9334e9
parent5b94f675f57e4ff16c8fda09088d7480a84dcd91
Merge branch 'linux-2.6'
16 files changed:
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/legacy_serial.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/vio.c
arch/ppc/syslib/ppc4xx_sgdma.c
drivers/ide/pci/pdc202xx_new.c
drivers/infiniband/hw/ehca/ehca_main.c
drivers/pci/hotplug/rpaphp_core.c
drivers/scsi/ibmvscsi/ibmvstgt.c
drivers/serial/of_serial.c
drivers/usb/host/ehci-ps3.c
drivers/usb/host/ohci-ps3.c
drivers/video/ps3fb.c
include/linux/suspend.h
kernel/power/Kconfig