Merge branch 'dt-bus-name' into for-next
authorRob Herring <robh@kernel.org>
Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)
committerRob Herring <robh@kernel.org>
Tue, 13 May 2014 23:34:35 +0000 (18:34 -0500)

Trivial merge