ARM: Merge for-2635/fb-updates1

Merge branch 'for-2635/fb-updates1' into for-linus/samsung2