diff options
| author | Tony Lindgren | 2011-12-06 17:50:42 +0100 |
|---|---|---|
| committer | Russell King | 2011-12-06 21:27:02 +0100 |
| commit | deee6d5359969a0ce4e2760cfd7b9f379bd5698a (patch) | |
| tree | 25ef0e899fd6f6ddc74396692aa9afa675f32243 /arch/arm/kernel | |
| parent | ARM: 7192/1: OMAP: Fix build error for omap1_defconfig (diff) | |
| download | kernel-qcow2-linux-deee6d5359969a0ce4e2760cfd7b9f379bd5698a.tar.gz kernel-qcow2-linux-deee6d5359969a0ce4e2760cfd7b9f379bd5698a.tar.xz kernel-qcow2-linux-deee6d5359969a0ce4e2760cfd7b9f379bd5698a.zip | |
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>
Diffstat (limited to 'arch/arm/kernel')
0 files changed, 0 insertions, 0 deletions