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

diff --combined Makefile
index cd5b619db9d8f479171a37ed64b004de7cc47310,31bbc6ab3b8ad5e0b74915983f6483fc9e3a86a5..a1158d1c051e348b86ba840fe7da5400714b0b72
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 16
 -EXTRAVERSION =-rc1
 +EXTRAVERSION =-rc2
  NAME=Sliding Snow Leopard
  
  # *DOCUMENTATION*
@@@ -442,7 -442,7 +442,7 @@@ export KBUILD_DEFCONFI
  config %config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
-       $(Q)$(MAKE) .kernelrelease
+       $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
  
  else
  # ===========================================================================