diff options
| author | Ingo Molnar | 2015-06-02 08:05:42 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-06-02 08:05:42 +0200 |
| commit | f407a8258610169cd8e975dba7f0b2824562014c (patch) | |
| tree | 6c87b2d168a4665411a9e16b9f481599f2db25bc /arch/arm/boot/dts/exynos4412-trats2.dts | |
| parent | x86: Remove cpu_sibling_mask() and cpu_core_mask() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-f407a8258610169cd8e975dba7f0b2824562014c.tar.gz kernel-qcow2-linux-f407a8258610169cd8e975dba7f0b2824562014c.tar.xz kernel-qcow2-linux-f407a8258610169cd8e975dba7f0b2824562014c.zip | |
Merge branch 'linus' into sched/core, to resolve conflict
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/exynos4412-trats2.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 173ffa479ad3..792394dd0f2a 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -736,7 +736,7 @@ display-timings { timing-0 { - clock-frequency = <0>; + clock-frequency = <57153600>; hactive = <720>; vactive = <1280>; hfront-porch = <5>; |