- Update to 3.4-rc7.

  - Eliminated 1 patch.

suse-commit: 4cd9e9b3221cc59ad85ef541c4ef65008045ecd1

diff --cc Makefile
Simple merge

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

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/md/dm-mpath.c
Simple merge

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

diff --cc drivers/xen/Kconfig
index 36b54dc,ea20c51..6f79fb1
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -639,18 -180,20 +639,20 @@@ config XEN_PRIVCM
  
  config XEN_ACPI_PROCESSOR
        tristate "Xen ACPI processor"
 -      depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
 +      depends on PARAVIRT_XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
        default m
        help
-           This ACPI processor uploads Power Management information to the Xen hypervisor.
- 
-         To do that the driver parses the Power Management data and uploads said
-         information to the Xen hypervisor. Then the Xen hypervisor can select the
-           proper Cx and Pxx states. It also registers itslef as the SMM so that
-           other drivers (such as ACPI cpufreq scaling driver) will not load.
- 
-           To compile this driver as a module, choose M here: the
-           module will be called xen_acpi_processor  If you do not know what to choose,
-           select M here. If the CPUFREQ drivers are built in, select Y here.
+           This ACPI processor uploads Power Management information to the Xen
+         hypervisor.
+ 
+         To do that the driver parses the Power Management data and uploads
+         said information to the Xen hypervisor. Then the Xen hypervisor can
+         select the proper Cx and Pxx states. It also registers itslef as the
+         SMM so that other drivers (such as ACPI cpufreq scaling driver) will
+         not load.
+ 
+           To compile this driver as a module, choose M here: the module will be
+         called xen_acpi_processor  If you do not know what to choose, select
+         M here. If the CPUFREQ drivers are built in, select Y here.
  
  endmenu

diff --cc mm/page_alloc.c
Simple merge