Sync'd u-boot-net with mainline
authorBen Warren <bwarren@qstreams.com>
Tue, 14 Aug 2007 01:26:03 +0000 (21:26 -0400)
committerBen Warren <bwarren@qstreams.com>
Tue, 14 Aug 2007 01:26:03 +0000 (21:26 -0400)
commitd1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995
treedd0722cee4758fe40f6a5cc75986ebb1a395aac2
parentf539edc076cfe52bff919dd512ba8d7af0e22092
parent8a92b7c60b40ff79e2cc96e13aeac2a531dde473
Sync'd u-boot-net with mainline

Merge git://www.denx.de/git/u-boot

Conflicts:

drivers/bcm570x.c
drivers/tigon3.c
drivers/bcm570x.c
drivers/tigon3.c