Merge branch 'next-s3c2440-gta02' into for-next