From: Wolfgang Denk <wd@denx.de>
Date: Thu, 12 May 2011 17:27:42 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2011.06-rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e0c0892a1fab6f93ba09d89ec3315f08f1b6ef4;p=thirdparty%2Fu-boot.git

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

0e0c0892a1fab6f93ba09d89ec3315f08f1b6ef4