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: firefly_0821_release~3680^2~2367^2^5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ce44a2174c3b07950d7a8d44774e23e60518205;p=firefly-linux-kernel-4.4.55.git

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