Merge tag 'v3.13-rc3' into devel

Linux 3.13-rc3

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

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

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

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

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

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

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

diff --cc include/linux/gpio/driver.h
Simple merge