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

Merge remote-tracking branch 'driver-core/driver-core-next'

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

eb6e838f9e4270bea1ced1a67aba536a48d0feae