Merge git://git.denx.de/u-boot into u-boot
authorBen Warren <biggerbadderben@gmail.com>
Sun, 25 Jan 2009 04:44:56 +0000 (20:44 -0800)
committerBen Warren <biggerbadderben@gmail.com>
Sun, 25 Jan 2009 04:44:56 +0000 (20:44 -0800)

Trivial merge