| commit | 46483d10e5123d78cf9abf37577aa8e75f18b8a4 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Mon, 5 Jan 2009 13:17:24 +0000 (5 14:17 +0100) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Mon, 5 Jan 2009 13:17:24 +0000 (5 14:17 +0100) | ||
| tree | ffb646db8023433588ce87797a9428c90ec118bc | treesnapshot (tar.gz zip) |
| parent | c59ab97e9ecdee9084d2da09e5a8ceea9a396508 | commitdiff |
| parent | 874d6a9555516cbac828131d573ce3d16ce47164 | commitdiff |
Merge branch 'core/iommu' into core/urgent
Conflicts:
lib/swiotlb.c
Conflicts:
lib/swiotlb.c
| arch/x86/kernel/pci-swiotlb_64.c | diff1 | diff2 | blobhistory |
| lib/swiotlb.c | diff1 | diff2 | blobhistory |