]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 864b94a 3a5dc1f)
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)
Required to apply Jiangs x86 irq handling rework without creating a
nightmare of conflicts.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
drivers/iommu/intel-iommu.c patch | diff1 | diff2 | blob | history

diff --cc drivers/iommu/intel-iommu.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.