Merge remote-tracking branch 'kbuild/for-next'

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/Kconfig

diff --cc Makefile
Simple merge

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/m32r/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/openrisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/platforms/wsp/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/um/Kconfig
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/Kconfig
Simple merge

diff --cc drivers/pci/Kconfig
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge