]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge