]> Pileus Git - ~andy/linux/commit
Merge tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 5 Sep 2012 05:38:11 +0000 (22:38 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 13 Sep 2012 07:16:45 +0000 (00:16 -0700)
commitf78a88d4976d1c8099d2afc4ceea14fa8b4bfaee
treee877c3aaa9a097eeb38d1c5ee0b839dec88f4812
parent1a876762064b8e1ff9a65e78a7cba09eb765a54b
parent0b5ea1e230432d79ce985338bbcbab1f82ae26a0
Merge tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/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
arch/arm/mach-ux500/Kconfig
arch/arm/mach-ux500/board-mop500.c