Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

46483d10

Commit 46483d10 authored 16 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'core/iommu' into core/urgent

Conflicts:
	lib/swiotlb.c

parents c59ab97e 874d6a95

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

arch/ia64/include/asm/swiotlb.h 1 addition, 38 deletions

arch/ia64/include/asm/swiotlb.h
arch/x86/include/asm/swiotlb.h 1 addition, 37 deletions

arch/x86/include/asm/swiotlb.h
arch/x86/kernel/pci-swiotlb_64.c 1 addition, 1 deletion

arch/x86/kernel/pci-swiotlb_64.c
include/linux/swiotlb.h 2 additions, 1 deletion

include/linux/swiotlb.h
lib/swiotlb.c 100 additions, 137 deletions

lib/swiotlb.c

with 105 additions and 214 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