Merge remote-tracking branch 'arm64/upstream'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 26 Sep 2012 00:06:36 +0000 (10:06 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 26 Sep 2012 00:06:36 +0000 (10:06 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 00:06:36 +0000 (10:06 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 00:06:36 +0000 (10:06 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/stat.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 00:06:36 +0000 (10:06 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 26 Sep 2012 00:06:36 +0000 (10:06 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/stat.c	patch \|	diff1 \|	diff2 \|	blob \| history