From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Babic <sbabic@denx.de>
Date: Tue, 16 Oct 2012 12:42:19 +0200
Subject: [U-Boot] i.MX : rebasing due to mistake
Message-ID: <507D3A0B.7000709@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi all i.MXlers,

my mistake. I have merged yesterday my -next branch without waiting for
Tom pulling u-boot/next into u-boot/master. Today I have conflicts, and
I could solve them only rebasing the tree on current mainline. I am
sorry for the inconvenience.

Regards,
Stefano babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================