From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 20 Mar 2006 16:42:05 +0000 (-0600)
Subject: Merge branch 'origin'
X-Git-Tag: v2025.01-rc5-pxa1908~23046^2^2~2
X-Git-Url: http://git.dujemihanovic.xyz/html/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=f8edca2e9a128f526b1fe6f997f7adb852cf5b3c;p=u-boot.git

Merge branch 'origin'

Conflicts:

	CHANGELOG
---

f8edca2e9a128f526b1fe6f997f7adb852cf5b3c