Merge tag 'mvebu-defconfig-4.6-2' of git://git.infradead.org/linux-mvebu into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 22:59:14 +0000 (23:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 22:59:14 +0000 (23:59 +0100)
Merge "mvebu defconfig for 4.6 (part 2)" from Gregory CLEMENT:

enable SRAM support in mvebu_v7_defconfig

* tag 'mvebu-defconfig-4.6-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: enable SRAM support in mvebu_v7_defconfig


Trivial merge