tree 25ef0e899fd6f6ddc74396692aa9afa675f32243
parent 16edc3df8a1b40fd381d3500f23527d7ad6e5e1b
author Tony Lindgren <tony@atomide.com> 1323190242 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1323203222 +0000

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>