Merge branch 'master' into teams

Author: Damian Rouson

ChangeLog

@@ -1,3 +1,12 @@
+2017-09-11  Kyrylo Tkachov  <[email protected]>
+
+	* MAINTAINERS (Reviewers): Move myself from here...
+	(CPU Port Maintainers): ... to here.
+
+2017-09-09  James Greenhalgh  <[email protected]>
+
+	* MAINTAINERS (James Greenhalgh): Move to AArch64 maintainers.
+
 2017-07-31  Robin Dapp  <[email protected]>
 
         * MAINTAINERS (write after approval): Add myself.

MAINTAINERS

@@ -39,13 +39,15 @@ their own patches from other maintainers or reviewers.
 
 			CPU Port Maintainers	(CPU alphabetical order)
 
-aarch64 port		Marcus Shawcroft	<[email protected]>
 aarch64 port		Richard Earnshaw	<[email protected]>
+aarch64 port		James Greenhalgh	<[email protected]>
+aarch64 port		Marcus Shawcroft	<[email protected]>
 alpha port		Richard Henderson	<[email protected]>
 arc port		Joern Rennecke		<[email protected]>
 arm port		Nick Clifton		<[email protected]>
 arm port		Richard Earnshaw	<[email protected]>
 arm port		Ramana Radhakrishnan	<[email protected]>
+arm port		Kyrylo Tkachov		<[email protected]>
 avr port		Denis Chertykov		<[email protected]>
 bfin port		Jie Zhang		<[email protected]>
 c6x port		Bernd Schmidt		<[email protected]>
@@ -249,10 +251,8 @@ check in changes outside of the parts of the compiler they maintain.
 
 			Reviewers
 
-aarch64 port		James Greenhalgh	<[email protected]>
 arc port		Andrew Burgess		<[email protected]>
 arc port		Claudiu Zissulescu	<[email protected]>
-arm port		Kyrylo Tkachov		<[email protected]>
 C front end		Marek Polacek		<[email protected]>
 dataflow		Paolo Bonzini		<[email protected]>
 dataflow		Seongbae Park		<[email protected]>