Merge 3.6-rc3 into tty-next

This picks up all of the different fixes in Linus's tree that we also need here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 45350ff5e93c..80bad32aa463 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -732,9 +732,9 @@ static int exynos_iommu_domain_init(struct iommu_domain *domain)
         spin_lock_init(&priv->pgtablelock);
         INIT_LIST_HEAD(&priv->clients);
 
-        dom->geometry.aperture_start = 0;
-        dom->geometry.aperture_end   = ~0UL;
-        dom->geometry.force_aperture = true;
+        domain->geometry.aperture_start = 0;
+        domain->geometry.aperture_end   = ~0UL;
+        domain->geometry.force_aperture = true;
 
         domain->priv = priv;
         return 0;