Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <jroedel@suse.de>
Tue, 22 Dec 2015 10:26:37 +0000 (11:26 +0100)
committerJoerg Roedel <jroedel@suse.de>
Tue, 22 Dec 2015 10:26:37 +0000 (11:26 +0100)

Trivial merge