]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'keystone-config' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh...
authorArnd Bergmann <arnd@arndb.de>
Thu, 8 Oct 2015 15:31:52 +0000 (17:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 8 Oct 2015 15:31:52 +0000 (17:31 +0200)
Merge "Couple of ARM Keystone config patches" from Santosh Shilimkar:
- Sync up the config with savedefconfig
- Add basic systemd options

* tag 'keystone-config' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: configs: keystone: Add basic systemd related options
  ARM: configs: keystone: sync to savedefconfig


Trivial merge