Update to 3.4-rc4.

suse-commit: 37113a82784227106387b5c161fda2c85669708f

diff --cc Makefile
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

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

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

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

diff --cc drivers/dma/Kconfig
Simple merge

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

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

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc fs/aio.c
Simple merge

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

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

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

diff --cc mm/mmap.c
Simple merge