Merge branch 'master' of git://git.denx.de/u-boot-x86
authorWolfgang Denk <wd@denx.de>
Wed, 15 Sep 2010 20:04:42 +0000 (22:04 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 15 Sep 2010 20:04:42 +0000 (22:04 +0200)

Trivial merge