git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 759643c e6bc593 f8ffcc9 500c25e 2e12bc2 44229b1)

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	009487258399cb4f431992919fa0f386d1b74ceb
tree	6e6bdafb4fa93a455c409bf9087fc60661cf464d	tree \| snapshot
parent	759643ce39f13c416236e2609ccaed9792107b2f	commit \| diff
parent	e6bc59330e34626082a6b2e4733802e372781c8d	commit \| diff
parent	f8ffcc9279f90ba3790c6dc0f01207ad6ea1c8df	commit \| diff
parent	500c25edda62a5d39c4d3b345c2e229a3f9d26be	commit \| diff
parent	2e12bc29fc5a12242d68e11875db3dd58efad9ff	commit \| diff
parent	44229b13bd74514ace76f7df40b388820a237288	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

Unnamed repository; edit this file 'description' to name the repository.