From: Tony Lindgren <tony@atomide.com>
Date: Mon, 20 Mar 2006 16:05:39 +0000 (-0800)
Subject: ARM: OMAP: Manual merge after updating to 2.6.16
X-Git-Tag: v2.6.16-omap1~30^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a02469001f79def59515164541a78ec2d20c9ba;p=pandora-kernel.git

ARM: OMAP: Manual merge after updating to 2.6.16

Manual merge after updating to 2.6.16
---

Reading git-diff-tree failed