Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Wed, 20 Oct 2010 19:23:22 +0000 (21:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 20 Oct 2010 19:23:22 +0000 (21:23 +0200)

Trivial merge