From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Tue, 19 Jun 2007 13:40:01 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: v1.3.0-rc3~3^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=448f5fea4c7dd531b69e4e60eed2a72b89b4ed6d;p=pandora-u-boot.git

Merge branch 'upstream'
---

448f5fea4c7dd531b69e4e60eed2a72b89b4ed6d