diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-06 09:47:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-06 09:47:57 -0700 |
| commit | 9e68447f5b38d6092a6feeeb713a6564e963e68b (patch) | |
| tree | ff38db3b4fd92c6c747718b1c0c79ccf2f8aa479 /arch/m32r/include/asm/kdebug.h | |
| parent | eea5b5510fc5545d15b69da8e485a7424ae388cf (diff) | |
| parent | eee53537c476c947bf7faa1c916d2f5a0ae8ec93 (diff) | |
Merge tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
"Two patches are in here which fix AMD IOMMU specific issues. One
patch fixes a long-standing warning on resume because the
amd_iommu_resume function enabled interrupts. The other patch fixes a
deadlock in an error-path of the page-fault request handling code of
the IOMMU driver.
* tag 'iommu-fixes-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/amd: Fix deadlock in ppr-handling error path
iommu/amd: Cache pdev pointer to root-bridge
Diffstat (limited to 'arch/m32r/include/asm/kdebug.h')
0 files changed, 0 insertions, 0 deletions