| commit | deee6d5359969a0ce4e2760cfd7b9f379bd5698a | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Tue Dec 06 17:50:42 2011 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Dec 06 20:27:02 2011 +0000 |
| tree | 25ef0e899fd6f6ddc74396692aa9afa675f32243 | |
| parent | 16edc3df8a1b40fd381d3500f23527d7ad6e5e1b [diff] |
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>