ARM: Merge for-2635/gpio2