Merge tag 'tags/soc_for_v3.10' into mvebu/dt
authorJason Cooper <jason@lakedaemon.net>
Mon, 15 Apr 2013 14:55:23 +0000 (14:55 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 15 Apr 2013 14:55:23 +0000 (14:55 +0000)
commitb757f17e9184b65428c48a281d82f9acb3e96f0e
tree7dc22c9f82f78c20caeff00fdd68a2e92e40504a
parent3c76a8a95daeecd881718f88324041f6a5faab86
parentda497f6fbaa190d34907ecc9dd85cfc62ba9f5a2
Merge tag 'tags/soc_for_v3.10' into mvebu/dt

Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.

mvebu soc changes for v3.10

 - use the mvebu-mbus driver
 - prep for LPAE support

Depends:
 - mvebu/cleanup (tags/cleanup_for_v3.10)
 - mvebu/drivers (tags/drivers_for_v3.10)
arch/arm/boot/dts/armada-370-xp.dtsi