Merge branch 'iommu/for-v3.16' of git://linuxtv.org/pinchartl/fbdev into arm/shmobile
authorJoerg Roedel <joro@8bytes.org>
Mon, 12 May 2014 18:45:58 +0000 (20:45 +0200)
committerJoerg Roedel <joro@8bytes.org>
Mon, 12 May 2014 18:45:58 +0000 (20:45 +0200)

Trivial merge