]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sun, 29 Jan 2017 22:46:54 +0000 (14:46 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 29 Jan 2017 22:46:54 +0000 (14:46 -0800)
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>

Trivial merge