From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Oct 2014 16:32:47 +0000 (-0700)
Subject: Merge tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~17151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b6ea43d3f90ba1db87883126c2c09777f51d3d6;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'tiny/kconfig-for-3.17' of https://git./linux/kernel/git/josh/linux

Pull kconfig fixes for tiny setups from Josh Triplett:
 "Two Kconfig bugfixes for 3.17 related to tinification.  These fixes
  make the Kconfig "General Setup" menu much more usable"

* tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux:
  init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu
  init/Kconfig: Hide printk log config if CONFIG_PRINTK=n
---

7b6ea43d3f90ba1db87883126c2c09777f51d3d6