Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Wed, 28 Nov 2012 03:34:51 +0000 (20:34 -0700)
committerTom Rini <[email protected]>
Wed, 28 Nov 2012 03:34:51 +0000 (20:34 -0700)

Trivial merge