Merge branch 'core/iommu' into core/urgent

Browse source

Conflicts:
	lib/swiotlb.c

...

This commit is contained in:

Ingo Molnar 2009-01-05 14:17:24 +01:00

parent c59ab97e9e 874d6a9555

commit 46483d10e5

5 changed files with 105 additions and 214 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/swiotlb.h

View file