Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Mon, 20 Jul 2009 20:57:25 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 20 Jul 2009 20:57:25 +0000 (22:57 +0200)

Trivial merge