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

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

Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)

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

Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)
diff --cc Documentation/devicetree/bindings/spi/spi-bus.txt
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 04:20:09 +0000 (14:20 +1000)