From: Olof Johansson Date: Sun, 2 Jun 2013 18:50:49 +0000 (-0700) Subject: Merge tag 'ux500-arm-soc-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=0b6825585bb9a896cd10adfdaf6c3724c419311c;p=linux-edison.git Merge tag 'ux500-arm-soc-v3.10-fixes-2' of git://git./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 * 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 --- 0b6825585bb9a896cd10adfdaf6c3724c419311c