]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'iommu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:24:57 +0000 (14:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 03:24:57 +0000 (14:24 +1100)
commitdaeebd929dcb02809eef737f6147d6fed30b34e5
tree9bb55cc76c57671898a5599062b024117d3f5271
parenta88a8e680454437fcdab68e55e6bfa153d893792
parent604542b824f72fa5d7fd977af277538c1e15b5f0
Merge remote-tracking branch 'iommu/next'

Conflicts:
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c