Merge branch 'next-gpio-update' into for-next