]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'omap-for-v5.5/pm' into omap-for-v5.5/soc
authorTony Lindgren <tony@atomide.com>
Wed, 23 Oct 2019 17:42:39 +0000 (10:42 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Oct 2019 17:42:39 +0000 (10:42 -0700)

Trivial merge