Merge branch 'devel-gpio' into omap-for-linus