Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  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

Fixed up trivial conflict in arch/arm/mach-ux500/cpu.c

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 44b285ac246c0e58080da2f46acc885dd022782e,0000000000000000000000000000000000000000..1b5ff4f515b8d2cfb7edd679ba05779a4ef7128d
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,46 -1,0 +1,47 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +It also includes a couple of directly applied patches for build breaks with subject
 +The next/* branches are kept in the order in which they get applied.
 +
 +fixes:
 +
 +next/fixes-non-critical:
++ux500/fixes-non-critical http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-updates
 +
 +next/cleanup:
 +cleanup/io-pci:   git://sources.calxeda.com/kernel/linux.git io-cleanup-pci-v2
 +bcmring/cleanup:  patches from Arnd
 +u300/cleanup    git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git u300-cleanup
 +csr/marco-prepare git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-prepare
 +                      (includes two patches from clk-next that adds prima2 clocks)
 +pmu/cleanup       git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.7
 +
 +next/maintainers:
 +
 +next/soc:
 +ux500/asic-id:        git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 +               + http://marc.info/?l=linux-arm-kernel&m=134667789927502
 +
 +next/dt:
 +pxa/dt:               git://github.com/hzhuang1/linux.git dt
 +
 +next/defconfig:
 +
 +next/drivers:
 +devel/led-driver      git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-arm-soc
 +at91/mci      git://github.com/at91linux/linux-at91 at91-for-next-soc
 +drivers/ocp2scp       patches from Kishon Vijay Abraham I <kishon@ti.com>
 +              + http://marc.info/?l=linux-next&m=134574365000518&w=2
 +
 +next/boards:
 +pxa/board     git://github.com/hzhuang1/linux.git board
 +
 +next/docs:
 +mvebu/docs:   git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc
 +
 +
 +
 +
 +

diff --cc arch/arm/mach-ux500/cpu-db8500.c
index 8169f2c72d6c593964db1a7f8a1abf88592db0ac,4e59746bcff42501b849b3049c2fe43d156bea83..3ce7d940fc3cfcf6dcbace5dbe27ec29357c177a
--- 1/arch/arm/mach-ux500/cpu-db8500.c
--- 2/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -18,7 -18,9 +18,8 @@@
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
  
+ #include <asm/pmu.h>
  #include <asm/mach/map.h>
 -#include <asm/pmu.h>
  #include <plat/gpio-nomadik.h>
  #include <mach/hardware.h>
  #include <mach/setup.h>

diff --cc arch/arm/mach-ux500/cpu.c
index 4b0a9b3003123e51da736e6421aede1e29eaaf46,29574325c361995f3d1a19806cfd12f30bbf2787..2b53ed2a3f1b84a40ad2e6e6dc87de1a94a68079
--- 1/arch/arm/mach-ux500/cpu.c
--- 2/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@@ -51,7 -51,9 +51,9 @@@ void __init ux500_init_irq(void
        void __iomem *dist_base;
        void __iomem *cpu_base;
  
 -      if (cpu_is_u8500_family()) {
+       gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
+ 
 +      if (cpu_is_u8500_family() || cpu_is_ux540_family()) {
                dist_base = __io_address(U8500_GIC_DIST_BASE);
                cpu_base = __io_address(U8500_GIC_CPU_BASE);
        } else