Merge tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 19:12:32 +0000 (21:12 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 19:12:32 +0000 (21:12 +0200)
commitbe36ad26b4d140895e425f86e484de912595829c
tree1e1989a168d69bd6d2a47101c9a99a91a9ad8120
parentccb0f688ea60b0b0128f3796f58879954c260f2f
parent9120abdcdb7fd3a51d3135ff37c9dad358dde9ee
Merge tag 'keystone_config_for_4.7' of git://git./linux/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