diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-02 11:50:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-02 11:51:04 -0700 |
| commit | 0b6825585bb9a896cd10adfdaf6c3724c419311c (patch) | |
| tree | 68db2adef7c8feb9720edce95bba529713759b5e /arch/arm/plat-samsung | |
| parent | 13731d862cf5219216533a3b0de052cee4cc5038 (diff) | |
| parent | 67b7c75e1a42f8288450203cd80a26b11dab8582 (diff) | |
| download | linux-0b6825585bb9a896cd10adfdaf6c3724c419311c.tar.bz2 | |
Merge tag 'ux500-arm-soc-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
From Linus Walleij, ux500 fixes for v3.10:
- A multiplatform fix making sure ux500_idle_init() is only executed on ux500.
- A regulator fix making sure the MMC/SD card regulator is not disabled on boot.
Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'ux500-arm-soc-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Provide supplies for AUX1, AUX2 and AUX3
ARM: ux500: Only configure wake-up reasons on ux500 based platforms
Diffstat (limited to 'arch/arm/plat-samsung')
0 files changed, 0 insertions, 0 deletions