Update to 3.4-final.

suse-commit: 91b2c6e7dedeaf80ebee53861f8eaadf972c40fe

diff --cc Makefile
Simple merge

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
index f1e560b,7c439fe..79c14db
--- 1/arch/x86/kernel/acpi/boot.c
--- 2/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -604,8 -593,7 +604,8 @@@ void __init acpi_set_irq_model_ioapic(v
  #ifdef CONFIG_ACPI_HOTPLUG_CPU
  #include <acpi/processor.h>
  
 +#ifndef CONFIG_XEN
- static void __cpuinitdata acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
+ static void __cpuinit acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
  {
  #ifdef CONFIG_ACPI_NUMA
        int nid;

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

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

diff --cc drivers/tty/vt/keyboard.c
Simple merge

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

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

diff --cc kernel/irq/chip.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge