diff options
author | Joerg Roedel <joro@8bytes.org> | 2012-03-22 19:28:39 +0100 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2012-03-22 19:28:39 +0100 |
commit | 7de473066f1512e52ea806e3c9698e5ea325b26c (patch) | |
tree | b5a52e0846c2f3851349dfc4e6c8ed88e64f3db8 /drivers/isdn/icn/icn.h | |
parent | Linux 3.3 (diff) | |
parent | iommu/tegra-gart: fix spin_unlock in map failure path (diff) | |
parent | iommu/amd: Fix section mismatch (diff) | |
download | linux-dev-7de473066f1512e52ea806e3c9698e5ea325b26c.tar.xz linux-dev-7de473066f1512e52ea806e3c9698e5ea325b26c.zip |
Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next