Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-exynos/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 53aa9b6a12dd ("ARM: mach-exynos: use standard
arch_idle()") from the arm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-exynos/common.c
index b6ac6ee,8484019..0000000
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -468,10 -459,7 +460,7 @@@ int __init exynos_init(void
  {
  	printk(KERN_INFO "EXYNOS: Initializing architecture\n");
  
- 	/* set idle function */
- 	pm_idle = exynos_idle;
- 
 -	return sysdev_register(&exynos4_sysdev);
 +	return device_register(&exynos4_dev);
  }
  
  static struct s3c24xx_uart_clksrc exynos4_serial_clocks[] = {