]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'iommu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:53:45 +0000 (13:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:53:45 +0000 (13:53 +1000)
Conflicts:
drivers/iommu/exynos-iommu.c


Trivial merge