Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Sat, 18 Jul 2009 12:59:05 +0000 (14:59 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 18 Jul 2009 12:59:05 +0000 (14:59 +0200)

Trivial merge