From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Mar 2016 02:39:28 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: v4.14-rc1~3540
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a1ef0e03eee4c5ac30d19bb1b88e57924295810;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull kconfig updates from Michal Marek:
 "Just two kconfig commits this time:

   - kconfig Makefile fix for make 3.80

   - Fix calculating symbols so that KCONFIG_ALLCONFIG=... does not
     disable CONFIG_MODULES silently"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  unbreak allmodconfig KCONFIG_ALLCONFIG=...
  scripts/kconfig: allow building with make 3.80 again
---

3a1ef0e03eee4c5ac30d19bb1b88e57924295810