From e176ed0fa84626aa47362016c06bd6f0c073af41 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 13 Feb 2006 09:50:03 -0800
Subject: [PATCH] ARM: OMAP: Fix merge conflicts manually

Fix merge conflicts manually
---
Reading git-format-patch failed