Merge tag 'for-linus-20151021' of git://git.infradead.org/intel-iommu