]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kerne...
authorJoerg Roedel <jroedel@suse.de>
Thu, 25 Sep 2014 13:34:23 +0000 (15:34 +0200)
committerJoerg Roedel <jroedel@suse.de>
Thu, 25 Sep 2014 13:34:23 +0000 (15:34 +0200)

Trivial merge