Merge remote-tracking branch 'leds/for-next'

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index e00029d66d66d7ab8e0b87f2764ee081d41cecea,52f22f9d633715de4d2c5ab7183411cac78ab78c..9c548515fc54047a5b3fb0e4af9ac46f2a8f5aa7
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -170,7 -170,6 +170,7 @@@ opencores  OpenCores.or
  option        Option NV
  ortustech     Ortus Technology Co., Ltd.
  ovti  OmniVision Technologies
 +ORCL  Oracle Corporation
  panasonic     Panasonic Corporation
  parade        Parade Technologies Inc.
  pericom       Pericom Technology Inc.
@@@ -205,6 -204,7 +205,7 @@@ seagate    Seagate Technology PL
  semtech       Semtech Corporation
  sgx   SGX Sensortech
  sharp Sharp Corporation
+ si-en Si-En Technology Ltd.
  sigma Sigma Designs, Inc.
  sil   Silicon Image
  silabs        Silicon Laboratories
@@@ -228,7 -228,6 +229,7 @@@ startek    Starte
  ste   ST-Ericsson
  stericsson    ST-Ericsson
  synology      Synology, Inc.
 +SUNW  Sun Microsystems, Inc
  tbs   TBS Technologies
  tcl   Toby Churchill Ltd.
  technologic   Technologic Systems