ARM: Merge for-2635-4/onenand