Merge branch 'hellrosa_i2c' of /home/gjb/git/u-boot
authorWolfgang Denk <wd@denx.de>
Wed, 10 Oct 2007 14:31:06 +0000 (16:31 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 10 Oct 2007 14:31:06 +0000 (16:31 +0200)

Trivial merge