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

Pull kbuild fixes from Michal Marek:
 "There are two more kbuild fixes for 3.6.

  One fixes a race between x86's archscripts target and the rule
  (re)building scripts/basic/fixdep.  The second is a fix for the
  previous attempt at fixing make firmware_install with make 3.82.
  This new solution should work with any version of GNU make"

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  x86/kbuild: archscripts depends on scripts_basic
  firmware: fix directory creation rule matching with make 3.80

diff --combined arch/x86/Makefile
index 682e9c2,c098ca4..474ca35
--- 1/arch/x86/Makefile
--- 2/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -27,10 -27,6 +27,10 @@@ ifeq ($(CONFIG_X86_32),y
  
          KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return
  
 +        # Never want PIC in a 32-bit kernel, prevent breakage with GCC built
 +        # with nonstandard options
 +        KBUILD_CFLAGS += -fno-pic
 +
          # prevent gcc from keeping the stack 16 byte aligned
          KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
  
@@@ -142,7 -138,7 +142,7 @@@ KBUILD_CFLAGS += $(call cc-option,-mno-
  KBUILD_CFLAGS += $(mflags-y)
  KBUILD_AFLAGS += $(mflags-y)
  
- archscripts:
+ archscripts: scripts_basic
        $(Q)$(MAKE) $(build)=arch/x86/tools relocs
  
  ###