diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 13:57:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 13:57:18 -0700 |
| commit | 0708500d49e8439d9fe5529795bdc1485f0f46c3 (patch) | |
| tree | 2019b8ebcd86c9b593e56ac1d630c921f130c8d3 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | be122abe4bcd6d39b37892daae28c8bf5e4030fc (diff) | |
| parent | 8d6c1efa51236bb781f202aa13b9f4ba654978c6 (diff) | |
| download | talos-obmc-linux-0708500d49e8439d9fe5529795bdc1485f0f46c3.tar.gz talos-obmc-linux-0708500d49e8439d9fe5529795bdc1485f0f46c3.zip | |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull device tree changes from Grant Likely:
"Mostly documentation updates, but also includes an empty stub for
non-CONFIG_OF builds."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
dt/documentation: Fix value format description
dt: add vendor prefix for EM Microelectronics
ARM: DT: Add binding for GIC virtualization extentions (VGIC)
of/irq: add empty irq_of_parse_and_map() for non-dt builds
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 107d8addf0e4..6eab91747a86 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -14,6 +14,7 @@ chrp Common Hardware Reference Platform cortina Cortina Systems, Inc. dallas Maxim Integrated Products (formerly Dallas Semiconductor) denx Denx Software Engineering +emmicro EM Microelectronic epson Seiko Epson Corp. est ESTeem Wireless Modems fsl Freescale Semiconductor |
