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

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

Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)

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

Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 02:36:28 +0000 (13:36 +1100)