diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:34:25 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:34:57 +0200 |
commit | 72275b4c08e7536ed5fe21c8899d99fc9f1fce7b (patch) | |
tree | a88352a67ee7aaac2bba4ae7ba3075638337af3f /drivers/bus/arm-cci.c | |
parent | 9ff3d178ab9e926b3194b266b4a28dc63226552d (diff) | |
parent | bfa1ce5f38938cc9e6c7f2d1011f88eba2b9e2b2 (diff) |
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.
Diffstat (limited to 'drivers/bus/arm-cci.c')
0 files changed, 0 insertions, 0 deletions