Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Mon, 7 Sep 2009 21:20:04 +0000 (23:20 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 7 Sep 2009 21:20:04 +0000 (23:20 +0200)

Trivial merge