Merge remote-tracking branch 'u-boot-samsung/master'