From: Wolfgang Denk <wd@denx.de>
Date: Wed, 23 Jun 2010 19:17:29 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2010.09-rc1~107^2~16
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=f35f3968c21bc8d01958ad1f92fe30e6ccc9c318

Merge branch 'master' into next
---

f35f3968c21bc8d01958ad1f92fe30e6ccc9c318