diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
commit | ffe732c2430c55074bebb172d33d909c662cd0e3 (patch) | |
tree | d39087d7b5d8caa505b23b6ea2abc2e33efa5be5 /Documentation/devicetree/bindings/clock/exynos5250-clock.txt | |
parent | 40ea2b42d7c44386cf81d5636d574193da2c8df2 (diff) | |
parent | 757dfcaa41844595964f1220f1d33182dae49976 (diff) | |
download | blackbird-op-linux-ffe732c2430c55074bebb172d33d909c662cd0e3.tar.gz blackbird-op-linux-ffe732c2430c55074bebb172d33d909c662cd0e3.zip |
Merge branch 'sched/urgent' into sched/core
Merge the latest batch of fixes before applying development patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/clock/exynos5250-clock.txt')
-rw-r--r-- | Documentation/devicetree/bindings/clock/exynos5250-clock.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt index 24765c146e31..46f5c791ea0d 100644 --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt @@ -5,7 +5,7 @@ controllers within the Exynos5250 SoC. Required Properties: -- comptible: should be one of the following. +- compatible: should be one of the following. - "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC. - reg: physical base address of the controller and length of memory mapped |