From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 May 2014 04:53:42 +0000 (-0700)
Subject: Merge tag 'mvebu-defconfig-3.16' of git://git.infradead.org/linux-mvebu into next... 
X-Git-Tag: v5.15~17469^2~46^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77d563d2113ec271e9af5c74dc50b634f772a983;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mvebu-defconfig-3.16' of git://git.infradead.org/linux-mvebu into next/boards

Merge "ARM: mvebu: defconfig changes for v3.16" from Jason Cooper:

mvebu defconfig changes for v3.16

 - enable the following:
    - nfsroot
    - fhandle
    - sdhci_pxav3
    - ahci_mvebu
    - spi_nor
    - sound for t5325

* tag 'mvebu-defconfig-3.16' of git://git.infradead.org/linux-mvebu:
  ARM: multi_v5_defconfig: Enable sound modules needed for t5325
  ARM: mvebu_v5_defconfig: Enable sound modules needed for t5325
  ARM: mvebu: defconfig: add MTD_SPI_NOR (new dependency for M25P80)
  ARM: configs: add ahci_mvebu to mvebu_v7_defconfig
  ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig
  ARM: mvebu: enable fhandle in the defconfigs
  ARM: mvebu: Enable nfsroot in the defconfig

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

77d563d2113ec271e9af5c74dc50b634f772a983