Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

diff --cc Makefile
index 2d68adbcfa28d43583ae0e12fbe3fef9a4d79d6a,c6aae86a02cdb1d2445b09aae41342256b5b8ebd..63e5c9f0bc7ad9776a4f9a33e07600b0085c5672
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -367,15 -369,10 +369,10 @@@ export AFLAGS AFLAGS_KERNEL AFLAGS_MODU
  # even be read-only.
  export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions
  
- # The temporary file to save gcc -MD generated dependencies must not
- # contain a comma
- comma := ,
- depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
- 
  # Files to ignore in find ... statements
  
 -RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc \) -prune -o
 -RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc
 +RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o
 +RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg
  
  # ===========================================================================
  # Rules shared between *config targets and build targets

diff --cc arch/m68knommu/Makefile
Simple merge

diff --cc arch/mips/Makefile
Simple merge

diff --cc drivers/block/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge