Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <joro@8bytes.org>
Mon, 12 May 2014 18:32:06 +0000 (20:32 +0200)
committerJoerg Roedel <joro@8bytes.org>
Mon, 12 May 2014 18:32:06 +0000 (20:32 +0200)

Trivial merge