linux-next: manual merge of the v4l-dvb tree with Linus' tree

From: Stephen Rothwell
Date: Thu Apr 09 2015 - 23:53:40 EST

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commit
f71b10be4c8a ("of: Add vendor prefix for Arasan") from Linus' tree and
commit 5888f9df0dcd ("[media] of: Add vendor prefix for Aptina
Imaging") from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 3e8bd6d34c96,4326f52eba73..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -21,7 -20,7 +21,8 @@@ amlogic Amlogic, Inc
ams AMS AG
amstaos AMS-Taos Inc.
apm Applied Micro Circuits Corporation (APM)
+ aptina Aptina Imaging
+arasan Arasan Chip Systems
arm ARM Ltd.
armadeus ARMadeus Systems SARL
asahi-kasei Asahi Kasei Corp.

Attachment: pgp_9v72LXX9n.pgp
Description: OpenPGP digital signature