git.baikalelectronics.ru Git - kernel.git/commit

author	Joerg Roedel <joerg.roedel@amd.com>
	Tue, 2 Oct 2012 12:40:03 +0000 (14:40 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Tue, 2 Oct 2012 12:40:03 +0000 (14:40 +0200)
commit	d0c7efa466880117bfc7561af1b6e8c4dcc27c9f
tree	6e6bdafb4fa93a455c409bf9087fc60661cf464d	tree \| snapshot
parent	59ab271bf98ba9dffbf583b897eefb291c8da9f9	commit \| diff
parent	989f1b69e9ac0fa3363c210fe11ac349b7e17939	commit \| diff
parent	0061bfcd8eb70ac463fabf85f1a9814c6e33df38	commit \| diff
parent	ae12fd0704a03615dd05956849b667414be809a4	commit \| diff
parent	d72addde6fa4dce68894d98e3f1ea30dd58ef4e4	commit \| diff
parent	cbf0ee3966495eace5e377eeb37179e6ca34746c	commit \| diff

Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next

Conflicts:
drivers/iommu/amd_iommu_init.c

drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/amd_iommu_init.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/amd_iommu_types.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/tegra-smmu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history