Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorWolfgang Denk <wd@denx.de>
Fri, 19 Nov 2010 21:02:40 +0000 (22:02 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 19 Nov 2010 21:02:40 +0000 (22:02 +0100)

Trivial merge