]> git.karo-electronics.de Git - linux-beck.git/commitdiff
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)
Conflicts:
drivers/iommu/intel-iommu.c

1  2 
drivers/iommu/dmar.c
drivers/iommu/intel-iommu.c

Simple merge
Simple merge