Merge tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

From Linus Walleij:
Removal of the <mach/id.h> include from ux500
- First an ACKed MFD patch deleting the only consumer
  of these cpu_is* functions outside of mach-ux500
- Introduce a new local cpu_is_u8580() in this patch
  set to avoid clashing with other patch sets.
- Finally de-globalize <mach/id.h>.

* tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: de-globalize <mach/id.h>
  ARM: ux500: Introduce cpu_is_u8580()
  mfd: prcmu: delete pin control helpers

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu.c
Simple merge

diff --cc arch/arm/mach-ux500/platsmp.c
index b8adac93421f378746fefbf17e98f87de80247c2,1a92e071bd61335e423f2f8aa13b3f888b4c1747..18f7af339dc9ff564e450e35444768e2fd91c1bf
--- 1/arch/arm/mach-ux500/platsmp.c
--- 2/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@@ -16,11 -16,12 +16,12 @@@
  #include <linux/device.h>
  #include <linux/smp.h>
  #include <linux/io.h>
 +#include <linux/irqchip/arm-gic.h>
  
  #include <asm/cacheflush.h>
 -#include <asm/hardware/gic.h>
  #include <asm/smp_plat.h>
  #include <asm/smp_scu.h>
+ 
  #include <mach/hardware.h>
  #include <mach/setup.h>
  

diff --cc arch/arm/mach-ux500/timer.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
Simple merge