From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 1 Jun 2015 15:34:25 +0000 (+0200)
Subject: Merge tag 'mvebu-drivers-4.2' of git://git.infradead.org/linux-mvebu into next/drivers
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=72275b4c08e7536ed5fe21c8899d99fc9f1fce7b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'mvebu-drivers-4.2' of git://git.infradead.org/linux-mvebu into next/drivers

Merge "mvebu drivers change for 4.2" from Gregory CLEMENT:

mvebu-mbus: add mv_mbus_dram_info_nooverlap() needed for the new
Marvell crypto driver

* tag 'mvebu-drivers-4.2' of git://git.infradead.org/linux-mvebu:
  bus: mvebu-mbus: add mv_mbus_dram_info_nooverlap()

Based on the earlier bug fixes branch, which contains six other
patches already merged into 4.1.
---

72275b4c08e7536ed5fe21c8899d99fc9f1fce7b