From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Dec 2011 16:08:14 +0000 (-0800)
Subject: Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=592d44a5f8458892c007c61b9cfa677efede5e1e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'iommu/fixes' of git://git./linux/kernel/git/joro/iommu

* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  MAINTAINERS: Update amd-iommu F: patterns
  iommu/amd: Fix typo in kernel-parameters.txt
  iommu/msm: Fix compile error in mach-msm/devices-iommu.c
  Fix comparison using wrong pointer variable in dma debug code
---

592d44a5f8458892c007c61b9cfa677efede5e1e