tree e64a32611c1a79cf6b45de4632b7016ead4d608a
parent 41e0e24b450fadc079dfb659d81f3076afcfbd8a
parent 83c3a1bad224189f22ca2c1955337c3478bd3ab2
author Linus Torvalds <torvalds@linux-foundation.org> 1482021024 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1482021024 -0800

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

Pull kconfig updates from Michal Marek:

 - 'make xconfig' gui fixes

 - 'make nconfig' fix for options with long prompts

 - fix 'make nconfig' warning when pkg-config forces -D_GNU_SOURCE

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  xconfig: fix missing suboption and help panels on first run
  xconfig: fix 'Show Debug' functionality
  kconfig/nconf: Fix hang when editing symbol with a long prompt
  Scripts: kconfig: nconf: fix _GNU_SOURCE redefined warning