summaryrefslogtreecommitdiff
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-01-03 09:59:54 (GMT)
committerKukjin Kim <kgene.kim@samsung.com>2011-01-03 09:59:54 (GMT)
commitc6906c3e29a4a28660f70421935c91cf6b8ab1e1 (patch)
tree40d97bdc21b95788ab24a4824c769b9dbe9b602b /arch/arm/plat-samsung
parent285dee7ff4fb4b32838694d4378f4aa938cf5b43 (diff)
parent8267e2e0fba74a944f9d0c9afd7779eb7272f5e7 (diff)
downloadlinux-fsl-qoriq-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.tar.xz
Merge branch 'next-s5pv310' into for-next
Conflicts: arch/arm/mach-s5pv310/Makefile
Diffstat (limited to 'arch/arm/plat-samsung')
0 files changed, 0 insertions, 0 deletions