Merge commit 'linus/master' into HEAD

Conflicts:
	MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc arch/x86/mm/init_32.c
Simple merge

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

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

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

diff --cc init/main.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/slub.c
Simple merge