Joerg Roedel b67ad2f7c7 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next ... Conflicts: drivers/iommu/amd_iommu_types.h		2015-11-02 20:03:34 +09:00
..
asm	Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next	2015-11-02 20:03:34 +09:00
uapi/asm	s390: wire up separate socketcalls system calls	2015-09-18 11:16:53 +02:00