tree ef7a993411e75bff9e136ff7e65262f5ccba6bf2
parent 0737c8d7aedfe590010e38c3e3bbdc87affa8c3d
parent 24cc7fb69a5b5edfdff1d38c6a213d6a33648829
author Linus Torvalds <torvalds@linux-foundation.org> 1348440058 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1348440058 -0700

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