]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <jroedel@suse.de>
Tue, 20 Sep 2016 11:24:14 +0000 (13:24 +0200)
committerJoerg Roedel <jroedel@suse.de>
Tue, 20 Sep 2016 11:24:14 +0000 (13:24 +0200)

Trivial merge