From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Sep 2012 22:40:58 +0000 (-0700)
Subject: Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56bae802681116dc279c40218b146b5a0c553a3b;p=linux-beck.git

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
---

56bae802681116dc279c40218b146b5a0c553a3b