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

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/iio/Kconfig
Simple merge

diff --cc drivers/md/Kconfig
Simple merge

diff --cc drivers/net/ethernet/ti/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/gadget/udc/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig
index cb9758e,75da4d3..87da53b
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -13,17 -13,8 +13,17 @@@ config RAID6_P
  config BITREVERSE
        tristate
  
 +config HAVE_ARCH_BITREVERSE
 +      bool
 +      default n
 +      depends on BITREVERSE
 +      help
 +        This option provides an config for the architecture which have instruction
 +        can do bitreverse operation, we use the hardware instruction if the architecture
 +        have this capability.
 +
  config RATIONAL
-       boolean
+       bool
  
  config GENERIC_STRNCPY_FROM_USER
        bool

diff --cc mm/Kconfig
Simple merge

diff --cc net/sched/Kconfig
Simple merge