Merge remote-tracking branch 'rpi/for-rpi-next'

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

Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)

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

Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 00:39:27 +0000 (10:39 +1000)