From: Wolfgang Denk <wd@denx.de>
Date: Tue, 10 Aug 2010 20:20:27 +0000 (+0200)
Subject: Merge branch 'master' of ../master
X-Git-Tag: v2010.09-rc1~28^2~4
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=201532a69cf7e7a84bff354fdab45947425d22b4

Merge branch 'master' of ../master
---

201532a69cf7e7a84bff354fdab45947425d22b4