commit | 51f37801b44fb5beb7f651e6f74e0dd90fd159c9 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Wed Jan 08 22:10:21 2014 -0800 |
committer | Olof Johansson <olof@lixom.net> | Wed Jan 08 23:02:26 2014 -0800 |
tree | 5b4e81fe8dbc7086b2c248d1b2e16584754f2e5e | |
parent | ced015aaa430e559ab2a44e858d25d6fdcca0a79 [diff] | |
parent | ead9e2936b071a501f7c7ff709802ea4257cd23a [diff] |
Merge tag 'ux500-core-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc From Linus Walleij: Ux500 core patches for the v3.14 series: - Enable PRINTK_TIME - Enable suspend with WFI * tag 'ux500-core-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: Enable system suspend with WFI support ARM: ux500: turn on PRINTK_TIME in u8500_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>