Subject: linux-next: manual merge of the arm-soc tree with the arm tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Dec 2011 10:52:52 +1100

Hi Arnd,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-mxs/mach-m28evk.c and
arch/arm/mach-mxs/mach-stmp378x_devb.c between commit d4e717535e94 ("ARM:
restart: mxs: use new restart hook") from the arm tree and commit
8d2d2d1d7e96 ("ARM: mxs: fix machines' initializers order") from the
arm-soc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/mach-mxs/mach-m28evk.c
index 7799cd9,6b00577..0000000
--- a/arch/arm/mach-mxs/mach-m28evk.c
+++ b/arch/arm/mach-mxs/mach-m28evk.c
@@@ -361,7 -361,6 +361,7 @@@ static struct sys_timer m28evk_timer = 
  MACHINE_START(M28EVK, "DENX M28 EVK")
  	.map_io		= mx28_map_io,
  	.init_irq	= mx28_init_irq,
- 	.init_machine	= m28evk_init,
  	.timer		= &m28evk_timer,
+ 	.init_machine	= m28evk_init,
 +	.restart	= mxs_restart,
  MACHINE_END
diff --cc arch/arm/mach-mxs/mach-stmp378x_devb.c
index 857e857,6834dea..0000000
--- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@@ -115,7 -115,6 +115,7 @@@ static struct sys_timer stmp378x_dvb_ti
  MACHINE_START(STMP378X, "STMP378X")
  	.map_io		= mx23_map_io,
  	.init_irq	= mx23_init_irq,
- 	.init_machine	= stmp378x_dvb_init,
  	.timer		= &stmp378x_dvb_timer,
+ 	.init_machine	= stmp378x_dvb_init,
 +	.restart	= mxs_restart,
  MACHINE_END