Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and...
authorJoerg Roedel <joro@8bytes.org>
Wed, 2 Apr 2014 17:13:12 +0000 (19:13 +0200)
committerJoerg Roedel <joro@8bytes.org>
Wed, 2 Apr 2014 17:13:12 +0000 (19:13 +0200)

Trivial merge