projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 16edc3d) | patch
ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart changes
authorTony Lindgren <tony@atomide.com>
Tue, 6 Dec 2011 16:50:42 +0000 (17:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 6 Dec 2011 20:27:02 +0000 (20:27 +0000)
commitdeee6d5359969a0ce4e2760cfd7b9f379bd5698a
tree25ef0e899fd6f6ddc74396692aa9afa675f32243tree | snapshot
parent16edc3df8a1b40fd381d3500f23527d7ad6e5e1bcommit | 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>
arch/arm/mach-omap2/display.c diff | blob | history
John Crispins staging tree