From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 31 Mar 2012 01:13:17 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: v3.14.22-mvebu~6025
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b17b4382c4bcb1952e9c6953284044970a274f3;p=people%2Farne_f%2Fkernel.git

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

Pull kconfig bits from Michal Marek:
 "There is one fix for make oldconfig by Arnaud and updates to the
  merge_config.sh tool."

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  merge_config.sh: Add option to display redundant configs
  merge_config.sh: Set execute bit
  merge_config.sh: Use the first file as the initial config
  kconfig: fix new choices being skipped upon config update
---

2b17b4382c4bcb1952e9c6953284044970a274f3