Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

7329cf02

Commit 7329cf02 authored 14 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'amd-iommu/2.6.36' of...

Merge branch 'amd-iommu/2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

parents 74b3c444 04e0463e

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/include/asm/amd_iommu_proto.h 6 additions, 0 deletions

arch/x86/include/asm/amd_iommu_proto.h
arch/x86/include/asm/amd_iommu_types.h 12 additions, 0 deletions

arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c 3 additions, 1 deletion

arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c 45 additions, 22 deletions

arch/x86/kernel/amd_iommu_init.c
include/linux/pci_ids.h 3 additions, 0 deletions

include/linux/pci_ids.h

with 69 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment