aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/btcx-risc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-14 13:05:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-14 13:05:27 -0800
commita9366e61b03f55a6e009e687ad10e706714c9907 (patch)
treeb68f510ae8924db3385eae783a1294d0af03ae37 /drivers/media/video/btcx-risc.c
parent24dfb2b5867df24ba03b6c4418312e23b1300aa8 (diff)
parent99dcadede42f8898d4c963ef69192ef4b9b76ba8 (diff)
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/media/video/btcx-risc.c')
0 files changed, 0 insertions, 0 deletions