ARM: Merge next-simtec

Merge branch 'next-simtec' into for-linus/samsung