Merge tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Oct 2014 16:32:47 +0000 (09:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Oct 2014 16:32:47 +0000 (09:32 -0700)
commit7b6ea43d3f90ba1db87883126c2c09777f51d3d6
tree588ae7d8722b5ba31337b72c3dd5d9a9b3143e0d
parent126d4576cb73c8a440adc37c129589cd66051bcc
parent62b4d2041117f35ab2409c9f5c4b8d3dc8e59d0f
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