Merge branch 'master' of git://git.denx.de/u-boot-x86
authorWolfgang Denk <wd@denx.de>
Mon, 11 Oct 2010 08:00:34 +0000 (10:00 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 11 Oct 2010 08:00:34 +0000 (10:00 +0200)

Trivial merge