]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 't-next-marvell' into t-next-at91
authorTom Rix <Tom.Rix@windriver.com>
Sun, 4 Oct 2009 21:57:09 +0000 (16:57 -0500)
committerTom Rix <Tom.Rix@windriver.com>
Sun, 4 Oct 2009 21:57:09 +0000 (16:57 -0500)

Trivial merge