diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-14 22:05:27 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-14 22:05:27 +0100 |
commit | a9366e61b03f55a6e009e687ad10e706714c9907 (patch) | |
tree | b68f510ae8924db3385eae783a1294d0af03ae37 /drivers/power/wm831x_power.c | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | intel-iommu: Support PCIe hot-plug (diff) | |
download | linux-a9366e61b03f55a6e009e687ad10e706714c9907.tar.xz linux-a9366e61b03f55a6e009e687ad10e706714c9907.zip |
Merge git://git.infradead.org/users/dwmw2/iommu-2.6.32
* git://git.infradead.org/users/dwmw2/iommu-2.6.32:
intel-iommu: Support PCIe hot-plug
intel-iommu: Obey coherent_dma_mask for alloc_coherent on passthrough
intel-iommu: Check for 'DMAR at zero' BIOS error earlier.
Diffstat (limited to 'drivers/power/wm831x_power.c')
0 files changed, 0 insertions, 0 deletions