projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bff547 08bb3ad)
Merge branch 'mvebu/soc' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Tue, 25 Feb 2014 17:33:37 +0000 (18:33 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 25 Feb 2014 17:33:37 +0000 (18:33 +0100)
Merge dependency for mvebu-soc-3xx branch from cleanups.

* mvebu/soc:
  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: Arnd Bergmann <arnd@arndb.de>

Trivial merge
Linux 6.x block layer and io_uring tree(s)