Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 16:08:14 +0000 (08:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 16:08:14 +0000 (08:08 -0800)
commit592d44a5f8458892c007c61b9cfa677efede5e1e
treecec376faf5dd25e1ce89134b0503d8354e473392
parent3ab345fc4b95a981a83f616487bbe07ddb5b1b1a
parentb2c1639135c0fc1560f3fe9a3a83f2c8265a9e02
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
Documentation/kernel-parameters.txt
MAINTAINERS