Merge tag 'mvebu-soc-3.15' of git://git.infradead.org/linux-mvebu into next/cleanup
authorOlof Johansson <olof@lixom.net>
Sat, 22 Feb 2014 00:33:50 +0000 (16:33 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 22 Feb 2014 00:33:50 +0000 (16:33 -0800)
commitdd67f8a05dcaeb818eb6dee4ab4ea0b2490b0efc
tree5750416d2787d04a9926bb24f59c12db5685b5f0
parenta671d255afb47bd2f83b94355b2848a0d46a1a92
parent08bb3adfd3adeb4653095e7968b6a46cef940404
Merge tag 'mvebu-soc-3.15' of git://git.infradead.org/linux-mvebu into next/cleanup

Merge "mvebu soc changes for v3.15" from Jason Cooper:

 - mvebu
    - Makefile cleanup and remove map_io
    - use of_find_matching_node_and_match

* tag 'mvebu-soc-3.15' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: remove unneeded ->map_io field for Armada 370/XP
  ARM: mvebu: make use of of_find_matching_node_and_match
  ARM: mvebu: Makefile clean-up

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