Merge branch 'x86/amd-avic' into x86/amd
authorJoerg Roedel <jroedel@suse.de>
Mon, 5 Sep 2016 10:43:16 +0000 (12:43 +0200)
committerJoerg Roedel <jroedel@suse.de>
Mon, 5 Sep 2016 10:43:16 +0000 (12:43 +0200)
commit368d06cd536ecace3a904ae2e6e42771636d52aa
treeb09c2b36487bb9af8a9b0587c63d8d012f7788ec
parent395adae45095e55ee90e688e9021d79dd6ffaefe
parentd98de49a53e48f51332e97568127e722415e1232
Merge branch 'x86/amd-avic' into x86/amd
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_proto.h