tree 8ab36656b004527e9bfc5d119649a78c854dee63
parent 96dd09d1dbd1455ea0c9094d3e8908d90b30c077
parent bca69e216a1a64b333566f88e9d0d3c980cc9d1e
author Linux Build Service Account <lnxbuild@localhost> 1382820787 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1382820787 -0700

Merge "timekeeping: utilize the suspend-nonstop clocksource to count suspended time"