On 14/09/15 04:26, Matt Ranostay wrote: > Signed-off-by: Matt Ranostay <[email protected]> Applied. Note there was fuzz in my tree as I am lagging mainline somewhat. However it is pretty obvious how to fix up merge issues in this file so lets not worry about that ;)
Jonathan > --- > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt > b/Documentation/devicetree/bindings/vendor-prefixes.txt > index ac5f0c3..281e8f0 100644 > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt > @@ -191,6 +191,7 @@ sbs Smart Battery System > schindler Schindler > seagate Seagate Technology PLC > semtech Semtech Corporation > +sgx SGX Sensortech > sharp Sharp Corporation > sil Silicon Image > silabs Silicon Laboratories > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
