Merge branch 'x86/vt-d' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 16 Dec 2014 11:25:38 +0000 (12:25 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 16 Dec 2014 11:25:38 +0000 (12:25 +0100)
commit8ab7913675726e5ae23b91221c0b5442d986d44a
treef2673dcb25e864cc87abe3f2d58db9bf9730f148
parent864b94adfcba752aa902ee34497bbe58b97aa8d3
parent3a5dc1fafb016560315fe45bb4ef8bde259dd1bc
Merge branch 'x86/vt-d' of git://git./linux/kernel/git/joro/iommu into x86/apic-picks

Required to apply Jiangs x86 irq handling rework without creating a
nightmare of conflicts.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/iommu/intel-iommu.c