summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/mips_ksyms.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 16:22:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 16:22:37 +0200
commit8123d8f17d8ba9d67e556688e4f025456ca97842 (patch)
tree1d15088a32644e464ad3536ad7bec775050065eb /arch/mips/kernel/mips_ksyms.c
parentMerge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/li... (diff)
parentMerge branch 'iommu/largepages' into amd-iommu/2.6.35 (diff)
downloadlinux-8123d8f17d8ba9d67e556688e4f025456ca97842.tar.xz
linux-8123d8f17d8ba9d67e556688e4f025456ca97842.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: Add amd_iommu=off command line option iommu-api: Remove iommu_{un}map_range functions x86/amd-iommu: Implement ->{un}map callbacks for iommu-api x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes kvm: Change kvm_iommu_map_pages to map large pages VT-d: Change {un}map_range functions to implement {un}map interface iommu-api: Add ->{un}map callbacks to iommu_ops iommu-api: Add iommu_map and iommu_unmap functions iommu-api: Rename ->{un}map function pointers to ->{un}map_range
Diffstat (limited to 'arch/mips/kernel/mips_ksyms.c')
0 files changed, 0 insertions, 0 deletions