Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Thu, 28 Apr 2011 21:19:18 +0000 (23:19 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 28 Apr 2011 21:19:18 +0000 (23:19 +0200)

Trivial merge