Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9g45.c between
commit 14f991a730f4 ("ARM: at91: Fix at91sam9g45 and at91cap9 reset")
from Linus' tree and commit c9dfafbaca0b ("ARM: mach-at91: move special
idle code out of line") from the arm tree.

Just context changes.  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-at91/at91cap9.c
index a42edc2,1d29a6c..0000000
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@@ -313,6 -315,17 +314,12 @@@ static struct at91_gpio_bank at91cap9_g
  	}
  };
  
+ static void at91cap9_idle(void)
+ {
+ 	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
+ 	cpu_do_idle();
+ }
+ 
 -static void at91cap9_restart(char mode, const char *cmd)
 -{
 -	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 -}
 -
  /* --------------------------------------------------------------------
   *  AT91CAP9 processor initialization
   * -------------------------------------------------------------------- */
@@@ -332,7 -344,8 +339,8 @@@ static void __init at91cap9_ioremap_reg
  
  static void __init at91cap9_initialize(void)
  {
+ 	arm_pm_idle = at91cap9_idle;
 -	arm_pm_restart = at91cap9_restart;
 +	arm_pm_restart = at91sam9g45_restart;
  	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
  
  	/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9g45.c
index 1cb6a96,0e80b39..0000000
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -317,6 -318,17 +317,12 @@@ static struct at91_gpio_bank at91sam9g4
  	}
  };
  
+ static void at91sam9g45_idle(void)
+ {
+ 	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
+ 	cpu_do_idle();
+ }
+ 
 -static void at91sam9g45_restart(char mode, const char *cmd)
 -{
 -	at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 -}
 -
  /* --------------------------------------------------------------------
   *  AT91SAM9G45 processor initialization
   * -------------------------------------------------------------------- */