From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 03:53:45 +0000 (+1000)
Subject: Merge remote-tracking branch 'iommu/next'
X-Git-Tag: next-20140530~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e18b8cabc1ef1db87a187c7e1143e23ad8974378;p=karo-tx-linux.git

Merge remote-tracking branch 'iommu/next'

Conflicts:
	drivers/iommu/exynos-iommu.c
---

e18b8cabc1ef1db87a187c7e1143e23ad8974378