| commit | de474f9b9724c683789bda823c1a80d703738a45 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Jan 29 14:46:54 2017 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sun Jan 29 14:46:54 2017 -0800 |
| tree | bb7ef7ee4f6631cc07c51803cbd4156b365874db | |
| parent | b5f8c90c75106f1167615f26b13927a05a1da9a7 [diff] | |
| parent | a2735c3067e7c25c46433c1d73b97d4d4e512de8 [diff] |
Merge tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig ARM: Keystone config support for 4.11 - Enable Reset controller and on chip MSM RAM support. * tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER ARM: configs: keystone: Enable Generic on-chip SRAM driver Signed-off-by: Olof Johansson <olof@lixom.net>