From: Joerg Roedel Date: Mon, 9 Jan 2012 12:04:05 +0000 (+0100) Subject: Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=00fb5430f547e411ab03385cfa548776aaac1c92;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next Conflicts: drivers/pci/hotplug/acpiphp_glue.c --- 00fb5430f547e411ab03385cfa548776aaac1c92