aboutsummaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-01-09 13:04:05 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2012-01-09 13:04:05 +0100
commit00fb5430f547e411ab03385cfa548776aaac1c92 (patch)
treef2c543e9c9ce4b1400081de08bcaf6fd55b72972 /virt
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff)
parent1a36ea815a3557c03819ec7c90a6b2fb128385ca (diff)
parent1456e9d2c4667a6e9221eda27b9648fb3bcc1e8e (diff)
downloadlinaro-lsk-00fb5430f547e411ab03385cfa548776aaac1c92.tar.gz
Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next
Conflicts: drivers/pci/hotplug/acpiphp_glue.c