tree 5e0cb2b934a01ce7e3fb78614b578b188b840134
parent 773433433791b9420c2a0f86b93c91d4115d89b5
parent b6a2ab2cd4739a9573ed41677e53171987b8da34
author Linus Torvalds <torvalds@linux-foundation.org> 1424371005 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1424371005 -0800

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

Pull kconfig updates from Michal Marek:
 "Yann E Morin was supposed to take over kconfig maintainership, but
  this hasn't happened.  So I'm sending a few kconfig patches that I
  collected:

   - Fix for missing va_end in kconfig
   - merge_config.sh displays used if given too few arguments
   - s/boolean/bool/ in Kconfig files for consistency, with the plan to
     only support bool in the future"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: use va_end to match corresponding va_start
  merge_config.sh: Display usage if given too few arguments
  kconfig: use bool instead of boolean for type definition attributes