diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-16 09:33:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-16 09:33:30 +0100 |
| commit | 860fc2f2640ec348b9520ca4649b1bfd23d91bc2 (patch) | |
| tree | 73d90d6ef86893c89bb70e78a2b63295d531f371 /Documentation/devicetree/bindings/clock/exynos5250-clock.txt | |
| parent | 197749981e539c1eb5863f417de6dd4e2c02b76c (diff) | |
| parent | bee09ed91cacdbffdbcd3b05de8409c77ec9fcd6 (diff) | |
| download | linux-860fc2f2640ec348b9520ca4649b1bfd23d91bc2.tar.gz linux-860fc2f2640ec348b9520ca4649b1bfd23d91bc2.tar.bz2 linux-860fc2f2640ec348b9520ca4649b1bfd23d91bc2.zip | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes, refresh the development tree.
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, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt index 46f5c791ea0d..0f2f920e8734 100644 --- a/Documentation/devicetree/bindings/clock/exynos5250-clock.txt +++ b/Documentation/devicetree/bindings/clock/exynos5250-clock.txt @@ -159,6 +159,8 @@ clock which they consume. mixer 343 hdmi 344 g2d 345 + mdma0 346 + smmu_mdma0 347 [Clock Muxes] |