Merge tag 'v3.14-rc6' into devel

Linux 3.14-rc6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-bcm-kona.c
Simple merge

diff --cc drivers/gpio/gpio-clps711x.c
Simple merge

diff --cc drivers/gpio/gpio-intel-mid.c
Simple merge

diff --cc include/linux/gpio/consumer.h
index dccda50,7a8144f..bed128e
--- 1/include/linux/gpio/consumer.h
--- 2/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@@ -4,9 -4,8 +4,7 @@@
  #include <linux/err.h>
  #include <linux/kernel.h>
  
- #ifdef CONFIG_GPIOLIB
- 
  struct device;
 -struct gpio_chip;
  
  /**
   * Opaque descriptor for a GPIO. These are obtained using gpiod_get() and are