Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Mon, 31 Jan 2011 22:17:33 +0000 (23:17 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 31 Jan 2011 22:17:33 +0000 (23:17 +0100)

Trivial merge