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

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

Pull "mvebu defconfig changes for v3.19 (round 2)" from Jason Cooper:

 - mvebu
    - Add SDHCI, i2c, and MTD_BLOCK

* tag 'mvebu-defconfig-3.19-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig
  ARM: mvebu: enable i2c device in mvebu_v7_defconfig
  ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>