From: Tom Rini <trini@ti.com>
Date: Thu, 20 Dec 2012 17:53:20 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-sh
X-Git-Tag: v2013.01-rc3~16
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=42e1321874f8a51373972c293f369c6973c85339

Merge branch 'master' of git://git.denx.de/u-boot-sh
---

42e1321874f8a51373972c293f369c6973c85339