Joerg Roedel 76771c938e Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next ...

Conflicts:
	drivers/iommu/arm-smmu.c

2014-12-02 13:07:13 +01:00

17 KiB

Raw Blame History

View Raw