Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Thu, 5 Mar 2015 21:41:04 +0000 (16:41 -0500)
committerTom Rini <[email protected]>
Fri, 6 Mar 2015 01:50:30 +0000 (20:50 -0500)

Trivial merge