[lkml]   [2015]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the v4l-dvb tree with Linus' tree
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

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.
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2015-04-10 06:21    [W:0.051 / U:3.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site