diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
| commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch) | |
| tree | 72481307c22f9b6170591cece793ea24f97a9ddb /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | f7b967bffefe69f1ad8b79e263237ec1feba7b9b (diff) | |
| parent | b6e3b5c2fea9c76617e101cbbc54ed14961f9dee (diff) | |
| download | lwn-6d55d5968a8622f3ea20ec40737aea1cfba6438c.tar.gz lwn-6d55d5968a8622f3ea20ec40737aea1cfba6438c.zip | |
Merge branch 'next/soc' into HEAD
Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile
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 db4d3af3643c..4f293e5571f0 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -10,6 +10,7 @@ apm Applied Micro Circuits Corporation (APM) arm ARM Ltd. atmel Atmel Corporation bosch Bosch Sensortec GmbH +brcm Broadcom Corporation cavium Cavium, Inc. chrp Common Hardware Reference Platform cortina Cortina Systems, Inc. |