git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb654496a5419c4a74d698489880bea26ef84720a
tree360977bbf4f8772199c85237d7da96ca934289c3tree
parent8f7501b85f0e140606fa92af906dc6a746d6b0a2commit | diff
parent7dd0502d69fabb35f1538aef241a7dc4b627eabacommit | 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>
Unnamed repository; edit this file 'description' to name the repository.