ARM: Merge next-jassi-spi

Merge branch 'next-jassi-spi' into next-samsung-try7