- Update to 3.1-rc7.

suse-commit: ee8cc90d708d00daa875c99f43c628b1d5a93fef

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

diff --cc Makefile
Simple merge

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

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

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

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

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

diff --cc fs/namei.c
Simple merge

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

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

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

diff --cc init/main.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge

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