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

1 files changed, 2 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 08e50c5c8948..f5dbc6d4261b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -921,7 +921,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
           machine.
 
 menuconfig CGROUPS
-        boolean "Control Group support"
+        bool "Control Group support"
         select KERNFS
         help
           This option adds support for grouping sets of processes together, for
@@ -1762,7 +1762,7 @@ config SLABINFO
         default y
 
 config RT_MUTEXES
-        boolean
+        bool
 
 config BASE_SMALL
         int