tree b5a52e0846c2f3851349dfc4e6c8ed88e64f3db8
parent c16fa4f2ad19908a47c63d8fa436a1178438c7e7
parent 09c32533c064782a7989b6fecce776833bca0e12
parent ae295142d2d3989e49c6425c90d2593732a068a1
author Joerg Roedel <joro@8bytes.org> 1332440919 +0100
committer Joerg Roedel <joro@8bytes.org> 1332440919 +0100

Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next