Merge branch '[email protected]' of git://git.denx.de/u-boot-staging
authorTom Rini <[email protected]>
Mon, 14 Jan 2013 22:30:31 +0000 (15:30 -0700)
committerTom Rini <[email protected]>
Mon, 14 Jan 2013 22:30:31 +0000 (15:30 -0700)

Trivial merge