diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-24 07:08:24 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-24 07:08:24 +0200 |
commit | 6a0596583fadd15dca293736114abdea306d3d7c (patch) | |
tree | 39ce634c2f9578c548f990215579559ba4dc630d /fs/ocfs2/acl.c | |
parent | 15cc91011246fa67f755eb3feea08d57a7692fde (diff) | |
parent | 4399c8bf2b9093696fa8160d79712e7346989c46 (diff) | |
download | kernel_goldelico_gta04-6a0596583fadd15dca293736114abdea306d3d7c.zip kernel_goldelico_gta04-6a0596583fadd15dca293736114abdea306d3d7c.tar.gz kernel_goldelico_gta04-6a0596583fadd15dca293736114abdea306d3d7c.tar.bz2 |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: fix superpage support in pfn_to_dma_pte()
intel-iommu: set iommu_superpage on VM domains to lowest common denominator
intel-iommu: fix return value of iommu_unmap() API
MAINTAINERS: Update VT-d entry for drivers/pci -> drivers/iommu move
intel-iommu: Export a flag indicating that the IOMMU is used for iGFX.
intel-iommu: Workaround IOTLB hang on Ironlake GPU
intel-iommu: Fix AB-BA lockdep report
Diffstat (limited to 'fs/ocfs2/acl.c')
0 files changed, 0 insertions, 0 deletions