Merge tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/linux/kernel/git...

This is three ux500 core updates with no direct relation
but grouped in a pull request:
- Set the proper GIC flags to mask when suspended and
  skip wake.
- Fix a build error introduced from the PMU patch set
- Provide a fixed regulator for the Snowball when not
  using DT.

* tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT
  ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c
  ARM: ux500: set proper GIC flags

diff --cc arch/arm/mach-ux500/Kconfig
Simple merge

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