From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Sep 2015 21:17:38 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: v4.14-rc1~4733
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=605e9710fb5fef0dd2bb49d7b75e46601df62112;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull kconfig updates from Michal Marek:
 - kconfig warns about junk characters in Kconfig files
 - merge_config.sh error handling
 - small cleanup

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  merge_config.sh: exit on missing input files
  kconfig: Regenerate shipped zconf.{hash,lex}.c files
  kconfig: warn of unhandled characters in Kconfig commands
  kconfig: Delete unnecessary checks before the function call "sym_calc_value"
---

605e9710fb5fef0dd2bb49d7b75e46601df62112