| commit | f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Sep 04 22:38:11 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Thu Sep 13 00:16:45 2012 -0700 |
| tree | e877c3aaa9a097eeb38d1c5ee0b839dec88f4812 | |
| parent | 1a876762064b8e1ff9a65e78a7cba09eb765a54b [diff] | |
| parent | 0b5ea1e230432d79ce985338bbcbab1f82ae26a0 [diff] |
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