| commit | 326f3abf19360014dfae968aa3ab891d25599618 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Mon Nov 19 13:18:47 2012 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Mon Nov 19 13:18:47 2012 +0900 |
| tree | a57251231cb889e4e6b0f26d023990578b7bd98e | |
| parent | ef405e04abd0d4bc3f7082d241517f6db3f5c06d [diff] | |
| parent | 64a574344dadbee5d01819d9d73b594d3cbe448e [diff] |
Merge branch 'next/dt-exynos4x12' into next/dt-samsung Conflicts: arch/arm/boot/dts/exynos4210.dtsi