]> git.baikalelectronics.ru Git - kernel.git/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)
commit9dfac443fb498aaa174b05810c932a8c9eb9e9f5
treee877c3aaa9a097eeb38d1c5ee0b839dec88f4812
parent793b1dda3c78413fddf32f8997c6b89a148d97d7
parentb83d84d09f86345a1b23d9cb0f6e8c086010872c
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