Merge branch 'ib-move-htc-egpio' into devel

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
index 915c7de,32ebc07..ab28a2d
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -46,8 -44,8 +46,9 @@@ obj-$(CONFIG_GPIO_EP93XX)     += gpio-ep93x
  obj-$(CONFIG_GPIO_ETRAXFS)    += gpio-etraxfs.o
  obj-$(CONFIG_GPIO_F7188X)     += gpio-f7188x.o
  obj-$(CONFIG_GPIO_GE_FPGA)    += gpio-ge.o
 +obj-$(CONFIG_GPIO_GPIO_MM)    += gpio-gpio-mm.o
  obj-$(CONFIG_GPIO_GRGPIO)     += gpio-grgpio.o
+ obj-$(CONFIG_HTC_EGPIO)               += gpio-htc-egpio.o
  obj-$(CONFIG_GPIO_ICH)                += gpio-ich.o
  obj-$(CONFIG_GPIO_IOP)                += gpio-iop.o
  obj-$(CONFIG_GPIO_IT87)               += gpio-it87.o

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
Simple merge