ARM: Merge for-2635/gpio2

Merge branch 'for-2635/gpio2' into for-linus/samsung2