]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'pm-hwmod-wdog' into pm-hwmods
authorKevin Hilman <khilman@deeprootsystems.com>
Fri, 1 Oct 2010 20:24:09 +0000 (13:24 -0700)
committerKevin Hilman <khilman@deeprootsystems.com>
Fri, 1 Oct 2010 20:24:09 +0000 (13:24 -0700)

Trivial merge