Merge branch 'master' of git://git.denx.de/u-boot-fdt
authorWolfgang Denk <wd@denx.de>
Wed, 27 Apr 2011 19:45:31 +0000 (21:45 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 27 Apr 2011 19:45:31 +0000 (21:45 +0200)

Trivial merge