ARM: Merge for-2635/defconfig3