Merge branch 'denx'
authorAndy Fleming <afleming@freescale.com>
Fri, 19 Oct 2007 16:24:22 +0000 (11:24 -0500)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Fri, 19 Oct 2007 16:24:22 +0000 (11:24 -0500)

Trivial merge