- Updated to 2.6.39-rc6.

  - 2 patches eliminated.

suse-commit: 2643e594e4be7b7f31dc38c6584e85ea636acc76

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/net/bnx2.c
Simple merge

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/scsi/device_handler/scsi_dh.c
index 47db0f9,0119b81..ffcd28b
--- 1/drivers/scsi/device_handler/scsi_dh.c
--- 2/drivers/scsi/device_handler/scsi_dh.c
+++ b/drivers/scsi/device_handler/scsi_dh.c
@@@ -394,12 -394,14 +394,14 @@@ int scsi_dh_activate(struct request_que
        unsigned long flags;
        struct scsi_device *sdev;
        struct scsi_device_handler *scsi_dh = NULL;
+       struct device *dev = NULL;
  
        spin_lock_irqsave(q->queue_lock, flags);
 -      sdev = q->queuedata;
 +      sdev = scsi_device_from_queue(q);
        if (sdev && sdev->scsi_dh_data)
                scsi_dh = sdev->scsi_dh_data->scsi_dh;
-       if (!scsi_dh || !get_device(&sdev->sdev_gendev) ||
+       dev = get_device(&sdev->sdev_gendev);
+       if (!scsi_dh || !dev ||
            sdev->sdev_state == SDEV_CANCEL ||
            sdev->sdev_state == SDEV_DEL)
                err = SCSI_DH_NOSYS;

diff --cc include/linux/mm.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/sunrpc/xprt.c
Simple merge