From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Mar 2014 20:01:50 +0000 (-0700)
Subject: Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh... 
X-Git-Tag: v3.15-rc1~78^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c37662b46e2b183bf6648b733968273fc9947c;p=thirdparty%2Flinux.git

Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/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
---

79c37662b46e2b183bf6648b733968273fc9947c