From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 05:38:11 +0000 (-0700)
Subject: Merge tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~1967^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee;p=firefly-linux-kernel-4.4.55.git

Merge tag 'ux500-core-updates' of git./linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical

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
---

f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee