summaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/include/plat/sram.h
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-11-19 13:18:47 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-11-19 13:18:47 +0900
commit326f3abf19360014dfae968aa3ab891d25599618 (patch)
treea57251231cb889e4e6b0f26d023990578b7bd98e /arch/arm/plat-omap/include/plat/sram.h
parentef405e04abd0d4bc3f7082d241517f6db3f5c06d (diff)
parent64a574344dadbee5d01819d9d73b594d3cbe448e (diff)
downloadlwn-326f3abf19360014dfae968aa3ab891d25599618.tar.gz
lwn-326f3abf19360014dfae968aa3ab891d25599618.zip
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Conflicts: arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'arch/arm/plat-omap/include/plat/sram.h')
0 files changed, 0 insertions, 0 deletions