From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 18 Dec 2013 21:19:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.01~13^2~30
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d627eefcd5e72db00889718ca9ee1dcb4d026fc9;p=bsp%2Fu-boot.git

Merge remote-tracking branch 'u-boot-pxa/master' into 'u-boot-arm/master'
---

d627eefcd5e72db00889718ca9ee1dcb4d026fc9