From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Dec 2011 16:50:42 +0000 (+0100)
Subject: ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes
X-Git-Tag: v3.3-rc1~141^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deee6d5359969a0ce4e2760cfd7b9f379bd5698a;p=pandora-kernel.git

ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes

ARM restart changes needed changes to common.h to make it local.
This conflicted with v3.2-rc4 DSS related hwmod changes that
git mergetool was not able to handle.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed