Merge tag 'mvebu-defconfig-3.14-2' of git://git.infradead.org/linux-mvebu into next...
authorOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 22:19:47 +0000 (14:19 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 22:19:47 +0000 (14:19 -0800)
From Jason Cooper:
mvebu defconfig changes for v3.14 (incremental #2)

 - mvebu
    - enable nand support

* tag 'mvebu-defconfig-3.14-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: config: Enable NAND support

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge