- Update to 3.2-rc6.

  - Eliminated 1 patch.

suse-commit: d5a489e07dc56c41c31b3fb3b23cb314fe67f31c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/system.h
Simple merge

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

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

diff --cc arch/x86/kernel/hpet.c
Simple merge

diff --cc arch/x86/kernel/quirks.c
Simple merge

diff --cc arch/x86/kernel/reboot.c
index 9893521,37a458b..1fbc281
--- 1/arch/x86/kernel/reboot.c
--- 2/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@@ -419,27 -428,34 +428,26 @@@ static struct dmi_system_id __initdata 
                        DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
                },
        },
 -      {       /* Handle problems with rebooting on the Latitude E6320. */
 +      {
                .callback = set_pci_reboot,
 -              .ident = "Dell Latitude E6320",
 +              .ident = "Dell Latitude E5xxx",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 -                      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6320"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5"),
                },
        },
 -      {       /* Handle problems with rebooting on the Latitude E5420. */
 +      {
                .callback = set_pci_reboot,
 -              .ident = "Dell Latitude E5420",
 +              .ident = "Dell Latitude E6xxx",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 -                      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"),
 -              },
 -      },
 -      {       /* Handle problems with rebooting on the Latitude E6420. */
 -              .callback = set_pci_reboot,
 -              .ident = "Dell Latitude E6420",
 -              .matches = {
 -                      DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 -                      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"),
 +                      DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6"),
                },
        },
-       {       /* Handle problems with rebooting on the Latitude E6420. */
+       {       /* Handle problems with rebooting on the OptiPlex 990. */
                .callback = set_pci_reboot,
-               .ident = "Dell Optiplex 990",
+               .ident = "Dell OptiPlex 990",
                .matches = {
-                       /* Found in BIOS version A06 */
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                        DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"),
                },

diff --cc arch/x86/kernel/rtc.c
index 6934cf2,af6db6e..6230bf8
--- 1/arch/x86/kernel/rtc.c
--- 2/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@@ -245,11 -243,10 +246,15 @@@ static __init int add_rtc_cmos(void
        if (of_have_populated_dt())
                return 0;
  
+       /* Intel MID platforms don't have ioport rtc */
+       if (mrst_identify_cpu())
+               return -ENODEV;
+ 
 +#ifdef CONFIG_XEN
 +      if (!is_initial_xendomain())
 +              return 0;
 +#endif
 +
        platform_device_register(&rtc_device);
        dev_info(&rtc_device.dev,
                 "registered platform RTC device (no PNP device found)\n");

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

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

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

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

diff --cc drivers/oprofile/oprof.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

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

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

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

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

diff --cc kernel/printk.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge

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

diff --cc net/netfilter/Kconfig
Simple merge