Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap', 'arm/tegra', 'core' and 'x86...
authorJoerg Roedel <joerg.roedel@amd.com>
Wed, 30 May 2012 10:41:29 +0000 (12:41 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Wed, 30 May 2012 10:41:29 +0000 (12:41 +0200)

Trivial merge