Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorJoerg Roedel <joro@8bytes.org>
Tue, 18 Feb 2014 11:26:36 +0000 (12:26 +0100)
committerJoerg Roedel <joro@8bytes.org>
Tue, 18 Feb 2014 11:26:36 +0000 (12:26 +0100)

Trivial merge