diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-12 01:30:19 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-12 01:30:19 +0200 |
| commit | 1647e3c73ce54fc32536bb3a834eccad39b23572 (patch) | |
| tree | 179bc08b3d067c8a791ec1c5059c3e0f2bfe9afd /Documentation | |
| parent | Merge tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kge... (diff) | |
| parent | ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support. (diff) | |
| download | linux-1647e3c73ce54fc32536bb3a834eccad39b23572.tar.xz linux-1647e3c73ce54fc32536bb3a834eccad39b23572.zip | |
Merge tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Few more omap device tree changes for v4.2 merge window:
- Add dm9000 Ethernet support to omap3-devkit8000
- Add Toby-Churchill SL50 board support
- Add vendor prefix for Toby Churchill Ltd
* tag 'omap-for-v4.2/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.
of: Add vendor prefix for Toby Churchill Ltd.
ARM: dts: omap3-devkit8000: Add dm9000 support
Diffstat (limited to 'Documentation')
| -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 11e4bdb07b6d..6964913d4755 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -195,6 +195,7 @@ ste ST-Ericsson stericsson ST-Ericsson synology Synology, Inc. tbs TBS Technologies +tcl Toby Churchill Ltd. thine THine Electronics, Inc. ti Texas Instruments tlm Trusted Logic Mobility |