From: Olof Johansson <olof@lixom.net>
Date: Tue, 12 Apr 2016 19:35:07 +0000 (-0700)
Subject: Merge tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu into fixes
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0b24f7a8d6e0d17bcf24433ce5827841a05b5b46;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu into fixes

mvebu fixes for 4.6 (part 1)

- fix USB adress register for Linksys Armada 388 based boards
- fix build warning in mvebu-mbus

* tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Correct unit address for linksys
  bus: mvebu-mbus: use %pa to print phys_addr_t

Signed-off-by: Olof Johansson <olof@lixom.net>
---

0b24f7a8d6e0d17bcf24433ce5827841a05b5b46