diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-05 18:20:17 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-05 18:20:17 -0500 |
| commit | 742eaa6a6e356a16788ce6530271de89bc4f8fb5 (patch) | |
| tree | 12fc040daab06ac796c61c1d92bfad9bb054d1c1 /Documentation/devicetree | |
| parent | ba8bb18a03f8c7508565c385576a5431a4ad804a (diff) | |
| parent | ae72fd588a2b302222769b44775912b83f0785eb (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Conflicts:
arch/arm/common/gic.c
arch/arm/plat-omap/include/plat/common.h
Diffstat (limited to 'Documentation/devicetree')
| -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 e8552782b440..874921e97802 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
| @@ -33,6 +33,7 @@ qcom Qualcomm, Inc. | |||
| 33 | ramtron Ramtron International | 33 | ramtron Ramtron International |
| 34 | samsung Samsung Semiconductor | 34 | samsung Samsung Semiconductor |
| 35 | schindler Schindler | 35 | schindler Schindler |
| 36 | sil Silicon Image | ||
| 36 | simtek | 37 | simtek |
| 37 | sirf SiRF Technology, Inc. | 38 | sirf SiRF Technology, Inc. |
| 38 | stericsson ST-Ericsson | 39 | stericsson ST-Ericsson |