linux-next: manual merge of the drm tree with the imx-mxs tree

2015-12-21 Thread Stephen Rothwell 
Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  453bb38ce504 ("devicetree: bindings: Add vendor prefix for Kosagi")

from the imx-mxs tree and commit:

  f42fb5539ab5 ("devicetree: add vendor prefix for Kyocera Corporation")

from the drm tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index e4cd78a4c652,b123731b2dca..
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -123,7 -124,7 +124,8 @@@ jedec  JEDEC Solid State Technology Asso
  karo  Ka-Ro electronics GmbH
  keymile   Keymile GmbH
  kinetic Kinetic Technologies
 +kosagiSutajio Ko-Usagi PTE Ltd.
+ kyo   Kyocera Corporation
  lacie LaCie
  lantiqLantiq Semiconductor
  lenovoLenovo Group Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the drm tree with the imx-mxs tree

2015-12-21 Thread Stephen Rothwell 
Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  453bb38ce504 ("devicetree: bindings: Add vendor prefix for Kosagi")

from the imx-mxs tree and commit:

  f42fb5539ab5 ("devicetree: add vendor prefix for Kyocera Corporation")

from the drm tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index e4cd78a4c652,b123731b2dca..
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -123,7 -124,7 +124,8 @@@ jedec  JEDEC Solid State Technology Asso
  karo  Ka-Ro electronics GmbH
  keymile   Keymile GmbH
  kinetic Kinetic Technologies
 +kosagiSutajio Ko-Usagi PTE Ltd.
+ kyo   Kyocera Corporation
  lacie LaCie
  lantiqLantiq Semiconductor
  lenovoLenovo Group Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/