Merge tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/l…

…inux/kernel/git/ssantosh/linux-keystone into next/defconfig

Merge "ARM: Keystone HOTPLUG and PSCI config update for 4.7" from Santosh Shilimkar

* tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: configs: keystone: Add CPU Hotplug related options

arch/arm/configs/keystone_defconfig

@@ -30,6 +30,8 @@ CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_KEYSTONE=y
 CONFIG_SMP=y
+CONFIG_HOTPLUG_CPU=y
+CONFIG_ARM_PSCI=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y