Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into...

author Joerg Roedel <joro@8bytes.org>

Fri, 4 Oct 2013 14:22:09 +0000 (16:22 +0200)

committer Joerg Roedel <joro@8bytes.org>

Fri, 4 Oct 2013 14:22:09 +0000 (16:22 +0200)
author Joerg Roedel <joro@8bytes.org>
Fri, 4 Oct 2013 14:22:09 +0000 (16:22 +0200)
committer Joerg Roedel <joro@8bytes.org>
Fri, 4 Oct 2013 14:22:09 +0000 (16:22 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/iommu/iommu.c
Simple merge
author	Joerg Roedel <joro@8bytes.org>
	Fri, 4 Oct 2013 14:22:09 +0000 (16:22 +0200)
committer	Joerg Roedel <joro@8bytes.org>
	Fri, 4 Oct 2013 14:22:09 +0000 (16:22 +0200)
		1	2	3	4	5
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/iommu/iommu.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history