From: Wolfgang Denk <wd@pollux.denx.de>
Date: Tue, 24 Oct 2006 15:08:31 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: U-Boot-1_1_6~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d97370feca2a589dad42154577bb4615a0347852;p=kernel%2Fu-boot.git

Merge with /home/wd/git/u-boot/master
(Conflicts between Jon Loeliger's and Matthew McClintock's tree
 were resolved by in favour of Jon's version.)
---

d97370feca2a589dad42154577bb4615a0347852