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

Trivial merge