]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3dd392a 72d3105 129d6ab 1e19b16)
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus...
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:47:12 +0000 (19:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:47:12 +0000 (19:47 +0200)
commit725c25819e4a0dafdcf42a5f31bc569341919c7c
treecd2f3d763848dc550c19daf42f6146425aff058ctree | snapshot
parent3dd392a407d15250a501fa109cc1f93fee95ef85commit | diff
parent72d31053f62c4bc464c2783974926969614a8649commit | diff
parent129d6aba444d1e99d4cbfb9866a4652912426b65commit | diff
parent1e19b16a30c34c042f1eaa23db4c99bfad1dac0ecommit | diff
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B

Conflicts:
arch/x86/kernel/pci-gart_64.c
include/asm-x86/dma-mapping.h
12 files changed:
Documentation/kernel-parameters.txt diff1 | diff2 | diff3 | diff4 | blob | history
MAINTAINERS diff1 | diff2 | diff3 | diff4 | blob | history
arch/x86/Kconfig diff1 | diff2 | diff3 | diff4 | blob | history
arch/x86/kernel/amd_iommu.c diff1 | diff2 | diff3 | diff4 | blob | history
arch/x86/kernel/pci-dma.c diff1 | diff2 | diff3 | diff4 | blob | history
arch/x86/kernel/pci-gart_64.c diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-x86/amd_iommu.h diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-x86/amd_iommu_types.h diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-x86/bitops.h diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-x86/dma-mapping.h diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-x86/gart.h diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-x86/iommu.h diff1 | diff2 | diff3 | diff4 | blob | history
Unnamed repository; edit this file 'description' to name the repository.