Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-samsung.c between commit 2760f7adbb6c ("gpio/exynos:
Fix compiler warnings when non-exynos machines are selected") from Linus'
tree and commit fd454997d687 ("gpio: samsung: refactor gpiolib init for
exynos4/5") from the gpio tree.

I used the version from the gpio tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au