summaryrefslogtreecommitdiffstats
path: root/fs/partitions
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 18:22:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 18:22:39 +0200
commitcc77b4db0017dab014ad7ea3d297e10f5b5bf028 (patch)
tree31d022e12b81d4870b00a766ba8ae085bb34f382 /fs/partitions
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentMerge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36 (diff)
downloadlinux-cc77b4db0017dab014ad7ea3d297e10f5b5bf028.tar.xz
linux-cc77b4db0017dab014ad7ea3d297e10f5b5bf028.zip
Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Export cache-coherency capability iommu-api: Extension to check for interrupt remapping x86/amd-iommu: Use for_each_pci_dev()
Diffstat (limited to 'fs/partitions')
0 files changed, 0 insertions, 0 deletions