Merge branch 'buckets/trace' into after-buckets
authorDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 08:34:17 +0000 (01:34 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 08:34:17 +0000 (01:34 -0700)
commitc6dfa10aa817c22e2b326e4d2d8ef05d6a598232
tree90681cbb8a6d99a84c0b929a183768fb258a3a98
parent3b9e6cec36690ef053d24d53478c31680a27b045
parent90c5c20f058c62e593641d042b98c57d80e1f963
Merge branch 'buckets/trace' into after-buckets

Conflicts:
include/trace/events/power.h
include/trace/events/power.h