Merge branch 'hellrosa_i2c' of /home/gjb/git/u-boot