Merge branch 'thread-irq-simpler' into devel

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

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

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

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