Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

diff --cc arch/arm/mach-pxa/pxa25x.c
index 3caa74a10d13ad73c3356b81bd279ab9e567b191,f0eda2094494ab3d1a460cda10ddfa6a112d5aea..25d17a1dab78bd68606224d233e6660960de0300
--- 1/arch/arm/mach-pxa/pxa25x.c
--- 2/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@@ -240,14 -218,9 +224,6 @@@ static void pxa25x_cpu_pm_save(unsigne
  
  static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)
  {
-       /* restore registers */
-       RESTORE(GAFR0_L); RESTORE(GAFR0_U);
-       RESTORE(GAFR1_L); RESTORE(GAFR1_U);
-       RESTORE(GAFR2_L); RESTORE(GAFR2_U);
-       RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);
- 
-       PSSR = PSSR_RDH | PSSR_PH;
 -      /* ensure not to come back here if it wasn't intended */
 -      PSPR = 0;
--
        RESTORE(CKEN);
        RESTORE(PSTR);
  }

diff --cc arch/arm/mach-pxa/pxa27x.c
index 4835207c142680c733b437aca03397e9404de8e9,0288665ad035a874a195590feff8b85e3486ae65..bf01e14098f5136a3cad39ba4d88f842c87f29cb
--- 1/arch/arm/mach-pxa/pxa27x.c
--- 2/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@@ -220,16 -202,11 +202,8 @@@ void pxa27x_cpu_pm_save(unsigned long *
  
  void pxa27x_cpu_pm_restore(unsigned long *sleep_save)
  {
-       /* restore registers */
-       RESTORE(GAFR0_L); RESTORE(GAFR0_U);
-       RESTORE(GAFR1_L); RESTORE(GAFR1_U);
-       RESTORE(GAFR2_L); RESTORE(GAFR2_U);
-       RESTORE(GAFR3_L); RESTORE(GAFR3_U);
-       RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2); RESTORE(PGSR3);
 -      /* ensure not to come back here if it wasn't intended */
 -      PSPR = 0;
--
        RESTORE(MDREFR);
-       RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);
-       RESTORE(PFER); RESTORE(PKWR);
+       RESTORE(PCFR);
  
        PSSR = PSSR_RDH | PSSR_PH;