Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Thu, 6 May 2010 21:21:00 +0000 (23:21 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 6 May 2010 21:21:00 +0000 (23:21 +0200)

Trivial merge