]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e50bc1 0c5ff0e)
Merge branch 'pm-sleep' into acpi-battery
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 May 2014 11:39:53 +0000 (13:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 May 2014 11:39:53 +0000 (13:39 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.