Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <jroedel@suse.de>
Fri, 7 Aug 2015 08:07:24 +0000 (10:07 +0200)
committerJoerg Roedel <jroedel@suse.de>
Fri, 7 Aug 2015 08:07:24 +0000 (10:07 +0200)

Trivial merge