Merge remote-tracking branch 'staging/staging-next'

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

Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)

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

Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/staging/android/ion/ion.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 03:06:14 +0000 (14:06 +1100)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion.c	patch \|	diff1 \|	diff2 \|	blob \| history