From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 23 Jul 2014 14:04:37 +0000 (+0200)
Subject: Merge branch 'core' into x86/vt-d
X-Git-Tag: v3.17-rc1~115^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbb24a25a871cbdac4e58b68b541aadd91b249be;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'core' into x86/vt-d

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

cbb24a25a871cbdac4e58b68b541aadd91b249be