Merge branch 'devm_gpiochip' of https://github.com/ldewangan/linux-upstream into...

author Linus Walleij <linus.walleij@linaro.org>

Thu, 25 Feb 2016 13:22:10 +0000 (14:22 +0100)

committer Linus Walleij <linus.walleij@linaro.org>

Thu, 25 Feb 2016 13:22:10 +0000 (14:22 +0100)
author Linus Walleij <linus.walleij@linaro.org>
Thu, 25 Feb 2016 13:22:10 +0000 (14:22 +0100)
committer Linus Walleij <linus.walleij@linaro.org>
Thu, 25 Feb 2016 13:22:10 +0000 (14:22 +0100)
diff --cc drivers/gpio/gpio-ts4800.c
Simple merge
diff --cc drivers/gpio/gpio-xgene-sb.c
Simple merge
author	Linus Walleij <linus.walleij@linaro.org>
	Thu, 25 Feb 2016 13:22:10 +0000 (14:22 +0100)
committer	Linus Walleij <linus.walleij@linaro.org>
	Thu, 25 Feb 2016 13:22:10 +0000 (14:22 +0100)
		1	2
drivers/gpio/gpio-ts4800.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpio-xgene-sb.c	patch \|	diff1 \|	diff2 \|	blob \| history