Merge remote-tracking branch 'fsl/next'

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

Mon, 19 May 2014 01:08:53 +0000 (11:08 +1000)

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

Mon, 19 May 2014 01:08:53 +0000 (11:08 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 01:08:53 +0000 (11:08 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 01:08:53 +0000 (11:08 +1000)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 May 2014 01:08:53 +0000 (11:08 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 May 2014 01:08:53 +0000 (11:08 +1000)