commit | d681f1204d701cafbc45fa90e0ac977acddc33cc | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 07 19:20:53 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 07 19:20:53 2011 -0700 |
tree | 6715571de1e965f2f12ef28d46da9ce09fef647c | |
parent | 6715a52a581c891e9a2034abe1c81ddb482d70b3 [diff] | |
parent | 26018874e3584f1658570d41d57d4c34f6a53aa0 [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Fix boot crash with hidden PCI devices x86/amd-iommu: Use only per-device dma_ops x86/amd-iommu: Fix 3 possible endless loops