diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 23:32:33 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 23:32:33 +0400 |
| commit | 9dc9b8e51f95fce0cc3d50ef80402203d2dcd68a (patch) | |
| tree | 1f98503a04cf6758a81f7945fd466aa668db1dc1 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | c7fed591a6d5ce080482e4237bd02c99857c0d4f (diff) | |
| parent | 70e123373c05e336f3f769b32c6132bdc2d6f5ac (diff) | |
| download | linux-9dc9b8e51f95fce0cc3d50ef80402203d2dcd68a.tar.xz | |
Merge tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu into next/drivers
From Jason Cooper:
mvebu driver changes for v3.14 (incremental #2)
- rtc
- add driver for Intersil ISL12057 chip
* tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu:
rtc: Add support for Intersil ISL12057 I2C RTC chip
b the commit.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 30261c831097..4da33c407de1 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -38,6 +38,7 @@ ibm International Business Machines (IBM) idt Integrated Device Technologies, Inc. img Imagination Technologies Ltd. intercontrol Inter Control Group +isl Intersil linux Linux-specific binding lsi LSI Corp. (LSI Logic) marvell Marvell Technology Group Ltd. |