Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: fix LOCALVERSION handling to match description
  kbuild: Fix modpost segfault

diff --combined Makefile
index d49d96c35ce5055c2f46ed8a9f3c35feef5c9eb2,324130c682dd947cf3d5f7be11b2e785a5fdf9a0..662e820cfc4ae754f9e82c69a9821401ab0d7eb5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 35
 -EXTRAVERSION = -rc2
 +EXTRAVERSION = -rc3
  NAME = Sheep on Meth
  
  # *DOCUMENTATION*
@@@ -944,7 -944,7 +944,7 @@@ ifdef CONFIG_LOCALVERSION_AUT
        localver-extra = $(scm-identifier)
  else
        ifneq ($(scm-identifier),)
-               ifeq ($(LOCALVERSION),)
+               ifeq ("$(origin LOCALVERSION)", "undefined")
                        localver-extra = +
                endif
        endif