]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/soc' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 27 Oct 2015 00:22:46 +0000 (09:22 +0900)
committerOlof Johansson <olof@lixom.net>
Tue, 27 Oct 2015 00:22:46 +0000 (09:22 +0900)
* next/soc:
  ARM: uniphier: rework SMP operations to use trampoline code
  ARM: uniphier: add outer cache support

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge