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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 9 Jan 2012 10:53:09 +1100

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-s5pv210/common.c between commit 7affca3537d7 ("Merge branch
'driver-core-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") from
Linus' tree and commit 58329cb3171f ("ARM: mach-s5pv210: use standard
arch_idle()") from the arm tree.

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

diff --cc arch/arm/mach-s5pv210/common.c
index 0ec3933,2622b8a..0000000
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@@ -247,11 -238,7 +239,7 @@@ core_initcall(s5pv210_core_init)
  int __init s5pv210_init(void)
  {
  	printk(KERN_INFO "S5PV210: Initializing architecture\n");
- 
- 	/* set idle function */
- 	pm_idle = s5pv210_idle;
- 
 -	return sysdev_register(&s5pv210_sysdev);
 +	return device_register(&s5pv210_dev);
  }
  
  static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {