summaryrefslogtreecommitdiffstats
path: root/arch/tile
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-12 15:31:37 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-05-12 15:31:37 +0900
commitad28536a898fbdc8c57d64348e310e1bda776963 (patch)
treeb057f2d095797399ce6ef01312359712e4b67b15 /arch/tile
parent18c411b7974f47f84c29507bdf3e0573890c0f0e (diff)
parent2a96536e77b43cf1e70ab3ad8b46b98ab52b56c1 (diff)
downloadtalos-obmc-linux-ad28536a898fbdc8c57d64348e310e1bda776963.tar.gz
talos-obmc-linux-ad28536a898fbdc8c57d64348e310e1bda776963.zip
Merge branch 'next/devel-samsung-iommu' into next/devel-samsung
Conflicts: arch/arm/mach-exynos/Makefile
Diffstat (limited to 'arch/tile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud