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)
commit79c37662b46e2b183bf6648b733968273fc9947c
treea24b4a9a91907efcc2a6fd5f8337926ecd817db3
parentb889f2d764c0d9f3ef1b77cfe3dac87493e12469
parentd6bb841291c44575e23ca0b6bb6b441661b0843f
Merge tag 'keystone-soc' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/boards

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