Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <jroedel@suse.de>
Mon, 30 Jan 2017 15:01:16 +0000 (16:01 +0100)
committerJoerg Roedel <jroedel@suse.de>
Mon, 30 Jan 2017 15:01:16 +0000 (16:01 +0100)

Trivial merge