[U-Boot] [STATUS] "next" branch rebased

[Wolfgang Denk]

Hi all,

unfortunately some merge conflicts have creeped in undetected into
the next branch. To fix the mess I had to rebase the "next" branch.

Sorry if this is causing inconveniences.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A wise person makes his  own  decisions,  a  weak  one  obeys  public
opinion.                                           -- Chinese proverb