]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-4.7/pwm-args' into for-4.7/pwm-regulator
authorThierry Reding <thierry.reding@gmail.com>
Tue, 3 May 2016 11:45:33 +0000 (13:45 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Tue, 3 May 2016 11:45:33 +0000 (13:45 +0200)

Trivial merge