Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Sat, 24 Jul 2010 18:41:28 +0000 (20:41 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Jul 2010 18:41:28 +0000 (20:41 +0200)

Trivial merge