Joerg Roedel 09b5269a1b Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next ... Conflicts: drivers/iommu/arm-smmu.c		2014-10-02 12:24:45 +02:00
..
kvm	Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next	2014-10-02 12:24:45 +02:00