From 8a02469001f79def59515164541a78ec2d20c9ba Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 20 Mar 2006 08:05:39 -0800
Subject: [PATCH] ARM: OMAP: Manual merge after updating to 2.6.16

Manual merge after updating to 2.6.16
---
Reading git-format-patch failed