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

diff --cc arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-mxc.c
index b588f8a41e601dfae772ee53570eec068bf5e78c,82f7b65baf7216a337b44ba46af2a956cde6cdb8..b81c989921141fc2fc1f457d62ed23a2f1d3ad7d
--- 1/drivers/gpio/gpio-mxc.c
--- 2/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -30,9 -30,8 +30,10 @@@
  #include <linux/of.h>
  #include <linux/of_device.h>
  #include <asm-generic/bug.h>
+ #include <asm/mach/irq.h>
  
 +#define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
 +
  enum mxc_gpio_hwtype {
        IMX1_GPIO,      /* runs on i.mx1 */
        IMX21_GPIO,     /* runs on i.mx21 and i.mx27 */

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