Merge branch 'master' of kerncvs.suse.de:/home/git/kernel-source

suse-commit: 2bb9bd0b0bd47195ef4a8ad9a0f924c66253481f

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

diff --cc arch/x86/pci/i386.c
Simple merge

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

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

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/i915_gem.c
Simple merge

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

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

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

diff --cc fs/proc/kcore.c
Simple merge

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

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

diff --cc kernel/resource.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc net/core/dev.c
Simple merge