Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Fri, 30 Nov 2012 14:15:27 +0000 (07:15 -0700)
committerTom Rini <[email protected]>
Fri, 30 Nov 2012 14:15:27 +0000 (07:15 -0700)

Trivial merge