Subject: linux-next: manual merge of the driver-core tree with the iommu tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 28 May 2014 17:55:31 +1000

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/iommu/exynos-iommu.c between commit 7222e8db2d50
("iommu/exynos: Fix build errors") from the iommu tree and commit
8283b4919e00 ("driver core: dev_set_drvdata can no longer fail") from
the driver-core tree.

I fixed it up (the former removed the code changed by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]