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)
commitbfc7bea6adc46e1db2f5a5e3464d7652ed67c864
tree4399dca93e4c42a3f652dd5b0b6143ab4aef50f4
parent29840de6b6d322e9cca3d22d254a1d066afbef02
parentc868af3e57610b41c6ed4fd8d8744d8cc0a21b29
Merge branch 'master' of git://git.denx.de/u-boot-x86