Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next

Browse source

Conflicts:
	drivers/iommu/amd_iommu_types.h

...

This commit is contained in:

Joerg Roedel 2015-11-02 20:03:34 +09:00

parent 6a13feb9c8 b61e5e80e3 3ca9299e7d 166bdbd231 8128f23c43 1228236de5 393c092a4d

commit b67ad2f7c7

27 changed files with 1995 additions and 443 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

85

include/linux/dma-iommu.h

View file

8

include/linux/iommu.h

View file