Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <jroedel@suse.de>
Thu, 25 Feb 2016 14:59:55 +0000 (15:59 +0100)
committerJoerg Roedel <jroedel@suse.de>
Thu, 25 Feb 2016 14:59:55 +0000 (15:59 +0100)

Trivial merge