From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Sep 2013 14:30:17 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: v3.12-rc1~18
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=183c420323a9e45af0d995d7cbf416221698cbe4;p=cascardo%2Flinux.git

Merge branch 'kconfig' of git://git./linux/kernel/git/mmarek/kbuild

Pull kconfig fix from Michal Marek:
 "This is a fix for a regression caused by my previous pull request.

  A sed command in scripts/config that used colons as separator was
  accidentally changed to use slashes, which fails when you use slashes
  in a value.  Changing it back to colons is of course not a proper fix,
  but at least it will be broken in the same way it had been for four
  years.  A proper fix is pending"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/config: fix variable substitution command
---

183c420323a9e45af0d995d7cbf416221698cbe4