From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 21 Jun 2011 09:14:10 +0000 (+0200)
Subject: Merge branches 'amd/transparent-bridge' and 'core'
X-Git-Tag: v3.1-rc1~303^2^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=801019d59d4e1d1523e5897949fd3b6843571bd0;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branches 'amd/transparent-bridge' and 'core'

Conflicts:
	arch/x86/include/asm/amd_iommu_types.h
	arch/x86/kernel/amd_iommu.c

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---

801019d59d4e1d1523e5897949fd3b6843571bd0