diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 07:22:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 07:22:37 -0700 |
| commit | 8123d8f17d8ba9d67e556688e4f025456ca97842 (patch) | |
| tree | 1d15088a32644e464ad3536ad7bec775050065eb /drivers/input/joystick | |
| parent | 06ee772043c7ad125f2c2e6a08dc563706f39e8d (diff) | |
| parent | 795e74f7a69f9c08afa4fa7c86cc4f18a62bd630 (diff) | |
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 'drivers/input/joystick')
0 files changed, 0 insertions, 0 deletions