Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Mon, 30 Apr 2012 14:43:52 +0000 (16:43 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 30 Apr 2012 14:43:52 +0000 (16:43 +0200)
* 'master' of /home/wd/git/u-boot/custodians:
  i2c:designware Turn off the ctrl when setting the speed
  i2c: Add support for designware i2c controller
  sh: i2c: Add support I2C controller of SH7734


Trivial merge