git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f7501b 7dd0502)
Merge tag 'mvebu-defconfig-3.19-2' of git://git.infradead.org/linux-mvebu into next...
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 21:27:11 +0000 (22:27 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 21:27:11 +0000 (22:27 +0100)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.