From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 17 Jul 2012 10:04:20 +0000 (+0200)
Subject: Merge tag 'v3.5-rc7' into arm/tegra
X-Git-Tag: master-2012-08-06~94^2^5
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8ce44a2174c3b07950d7a8d44774e23e60518205;p=~andy%2Flinux

Merge tag 'v3.5-rc7' into arm/tegra

This solves the merge conflicts while creating the next
branch.

Linux 3.5-rc7

Conflicts:
	drivers/iommu/tegra-smmu.c
---

8ce44a2174c3b07950d7a8d44774e23e60518205