commit 1a0e3a35c651b56db59a28b5f693cdf9d4582b56
author Wolfram Sang <wsa@the-dreams.de> Fri Mar 02 11:04:33 2018 +0100
committer Wolfram Sang <wsa@the-dreams.de> Fri Mar 02 11:04:33 2018 +0100
tree b9aff4ceb273234419492567f45e7bbe9f2fb33e
parent 4a3928c6f8a53fa1aed28ccba227742486e8ddcb
parent 377999caf72233af4abebb511359647f312c4e6e

Merge tag 'at24-4.16-rc4-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current

Pull in this fixup to get rid of a dependency for the next cycle:

"- sort the manufacturers in DT bindings alphabetically"

Documentation/devicetree/bindings/eeprom/at24.txt

diff --git a/Documentation/devicetree/bindings/eeprom/at24.txt b/Documentation/devicetree/bindings/eeprom/at24.txt
index 1812c84..abfae1b 100644
--- a/Documentation/devicetree/bindings/eeprom/at24.txt
+++ b/Documentation/devicetree/bindings/eeprom/at24.txt
@@ -38,9 +38,9 @@
 
                 "catalyst",
                 "microchip",
+                "nxp",
                 "ramtron",
                 "renesas",
-                "nxp",
                 "st",
 
                 Some vendors use different model names for chips which are just