- Updated to 2.6.32-final.

  - 2 patches eliminated.

suse-commit: 14e98d7d80b640b03ac8570d69ecf72be5b8f278

diff --cc .gitignore
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/acpi/processor.c
index 873718d,d85d1b2..dc07868
--- 1/arch/x86/kernel/acpi/processor.c
--- 2/arch/x86/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
@@@ -76,21 -76,11 +76,22 @@@ static void init_intel_pdc(struct acpi_
  /* Initialize _PDC data based on the CPU vendor */
  void arch_acpi_processor_init_pdc(struct acpi_processor *pr)
  {
 +#ifdef CONFIG_XEN
 +      /*
 +       * As a work-around, just use cpu0's cpuinfo for all processors.
 +       * Further work is required to expose xen hypervisor interface of
 +       * getting physical cpuinfo to dom0 kernel and then
 +       * arch_acpi_processor_init_pdc can set _PDC parameters according
 +       * to Xen's phys information.
 +       */
 +      struct cpuinfo_x86 *c = &boot_cpu_data;
 +#else
        struct cpuinfo_x86 *c = &cpu_data(pr->id);
 +#endif
  
        pr->pdc = NULL;
-       if (c->x86_vendor == X86_VENDOR_INTEL)
+       if (c->x86_vendor == X86_VENDOR_INTEL ||
+           c->x86_vendor == X86_VENDOR_CENTAUR)
                init_intel_pdc(pr, c);
  
        return;

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

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/char/agp/intel-agp.c
Simple merge

diff --cc drivers/char/keyboard.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/e1000e/e1000.h
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/scsi/hosts.c
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/scsi/scsi_sysfs.c
index 537f4ac,392d8db..7ec7d97
--- 1/drivers/scsi/scsi_sysfs.c
--- 2/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@@ -897,22 -860,20 +896,24 @@@ int scsi_sysfs_add_sdev(struct scsi_dev
        error = device_add(&sdev->sdev_dev);
        if (error) {
                printk(KERN_INFO "error 2\n");
-               goto clean_device;
+               device_del(&sdev->sdev_gendev);
+               goto out_remove;
        }
+       transport_add_device(&sdev->sdev_gendev);
+       sdev->is_visible = 1;
  
        /* create queue files, which may be writable, depending on the host */
 -      if (sdev->host->hostt->change_queue_depth)
 -              error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_depth_rw);
 +      if (sdev->host->hostt->change_queue_depth) {
 +              error = device_create_file(&sdev->sdev_gendev,
 +                                         &sdev_attr_queue_depth_rw);
 +              error = device_create_file(&sdev->sdev_gendev,
 +                                         &sdev_attr_queue_ramp_up_period);
 +      }
        else
                error = device_create_file(&sdev->sdev_gendev, &dev_attr_queue_depth);
-       if (error) {
-               __scsi_remove_device(sdev);
-               goto out;
-       }
+       if (error)
+               goto out_remove;
+ 
        if (sdev->host->hostt->change_queue_type)
                error = device_create_file(&sdev->sdev_gendev, &sdev_attr_queue_type_rw);
        else

diff --cc drivers/serial/sunhv.c
Simple merge

diff --cc drivers/serial/sunsab.c
Simple merge

diff --cc drivers/serial/sunsu.c
Simple merge

diff --cc drivers/serial/sunzilog.c
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

diff --cc drivers/usb/host/ehci-pci.c
Simple merge

diff --cc drivers/usb/host/ehci-q.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/ocfs2/ocfs2.h
Simple merge

diff --cc fs/ocfs2/super.c
Simple merge

diff --cc include/scsi/scsi_device.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc net/ipv4/ip_fragment.c
Simple merge

diff --cc scripts/kconfig/Makefile
Simple merge