diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 09:38:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 11:16:45 +0400 |
| commit | f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee (patch) | |
| tree | e877c3aaa9a097eeb38d1c5ee0b839dec88f4812 /arch/arm/mach-ux500/timer.c | |
| parent | 1a876762064b8e1ff9a65e78a7cba09eb765a54b (diff) | |
| parent | 0b5ea1e230432d79ce985338bbcbab1f82ae26a0 (diff) | |
| download | linux-f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee.tar.xz | |
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
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
0 files changed, 0 insertions, 0 deletions