]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh...
authorOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 20:01:50 +0000 (13:01 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 20:01:50 +0000 (13:01 -0700)
Keystone SOC updates for 3.15

- Enable Watchdog and GPIO config
- Enable LED driver config
- Enable NAND and EMIF driver config

* tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: config: keystone: enable AEMIF/NAND support
  ARM: config: keystone: enable led support
  ARM: config: keystone: enable gpio support
  ARM: config: keystone: enable watchdog support


Trivial merge