Merge branch 'core' into x86/vt-d
authorJoerg Roedel <jroedel@suse.de>
Wed, 23 Jul 2014 14:04:37 +0000 (16:04 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 23 Jul 2014 14:04:37 +0000 (16:04 +0200)
commitcbb24a25a871cbdac4e58b68b541aadd91b249be
tree0b8207913c437d91c938a64a48c1a1751a31a37b
parentaa4d066a2a8041b7e73cee68ce5499aca29f265e
parente09f8ea560490e941139d23b4c278d3e6e2c871a
Merge branch 'core' into x86/vt-d

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