linux-next: manual merge of the s5p tree with Linus' tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c2440/common.h between commit c1ba544f8154 ("ARM:
S3C24XX: Fix restart on S3C2442") from Linus' tree and commit
dd6f01b5ccba ("ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/")
from the s5p tree.

The latter removed the file so I did that.  I also added this fix up
patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 7 Mar 2012 11:26:40 +1100
Subject: [PATCH] ARM: S3C24XX: fix for Fix restart on S3C2442

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/arm/mach-s3c24xx/common.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c24xx/common.h b/arch/arm/mach-s3c24xx/common.h
index 62a2e19..39f5394 100644
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@ -17,7 +17,7 @@ void s3c2410_restart(char mode, const char *cmd);
 #endif
 
 #ifdef CONFIG_CPU_S3C2440
-void s3c2440_restart(char mode, const char *cmd);
+void s3c244x_restart(char mode, const char *cmd);
 #endif
 
 #endif /* __ARCH_ARM_MACH_S3C2410_COMMON_H */
-- 
1.7.9.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature