commit | b654496a5419c4a74d698489880bea26ef84720a | [log] [tgz] |
---|---|---|
author | Arnd Bergmann <arnd@arndb.de> | Fri Nov 28 22:27:11 2014 +0100 |
committer | Arnd Bergmann <arnd@arndb.de> | Fri Nov 28 22:27:11 2014 +0100 |
tree | 360977bbf4f8772199c85237d7da96ca934289c3 | |
parent | 8f7501b85f0e140606fa92af906dc6a746d6b0a2 [diff] | |
parent | 7dd0502d69fabb35f1538aef241a7dc4b627eaba [diff] |
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>