Merge

diff --cc Documentation/kbuild/makefiles.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/i386/boot/Makefile
Simple merge

diff --cc arch/m68knommu/platform/5307/Makefile
Simple merge

diff --cc arch/ppc64/Makefile
Simple merge

diff --cc arch/x86_64/boot/Makefile
Simple merge