Merge commit '8bb65fc06c' into next/soc

This includes one fix from mainline to avoid introducing a build
regression after the pxa tree starts using gpio-reg:

drivers/gpio/gpio-reg.c:106:21: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
drivers/gpio/gpio-reg.c:107:29: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?

* commit '8bb65fc06c':
  gpio: gpio-reg: fix build

Signed-off-by: Arnd Bergmann <arnd@arndb.de>