Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <joro@8bytes.org>
Tue, 4 Mar 2014 13:54:27 +0000 (14:54 +0100)
committerJoerg Roedel <joro@8bytes.org>
Tue, 4 Mar 2014 13:54:27 +0000 (14:54 +0100)

Trivial merge