Merge remote-tracking branch 'gpio/gpio/next'

diff --cc drivers/gpio/Kconfig
Simple merge

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

diff --cc drivers/gpio/gpiolib-of.c
Simple merge

diff --cc drivers/of/Kconfig
Simple merge

diff --cc drivers/of/Makefile
index 0040d1858665c9c62c0d8791c82b59c60703838c,aff2c62303907529ae88a3fd2a61b2f6af214b76..e027f444d10cfeae104eca088bf8c7824d88ba5f
--- 1/drivers/of/Makefile
--- 2/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@@ -4,9 -4,9 +4,8 @@@ obj-$(CONFIG_OF_PROMTREE) += pdt.
  obj-$(CONFIG_OF_ADDRESS)  += address.o
  obj-$(CONFIG_OF_IRQ)    += irq.o
  obj-$(CONFIG_OF_DEVICE) += device.o platform.o
- obj-$(CONFIG_OF_GPIO)   += gpio.o
  obj-$(CONFIG_OF_I2C)  += of_i2c.o
  obj-$(CONFIG_OF_NET)  += of_net.o
 -obj-$(CONFIG_OF_SPI)  += of_spi.o
  obj-$(CONFIG_OF_SELFTEST) += selftest.o
  obj-$(CONFIG_OF_MDIO) += of_mdio.o
  obj-$(CONFIG_OF_PCI)  += of_pci.o