aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ftrace_event.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-05 17:51:24 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-05 17:51:24 -0400
commit3bb314f01c189f0c48c0946424955c6d8ddce3d8 (patch)
treed0de7369247689f009c2e0f3fb3bd121555efce1 /include/linux/ftrace_event.h
parent535e0c1726bec699a8f0f5b86fe7d399546b2555 (diff)
parentce6c3997c2fce74d12e6d8887a1d8cdf024fa850 (diff)
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Re-enable cpufreq suspend and resume code
Diffstat (limited to 'include/linux/ftrace_event.h')
0 files changed, 0 insertions, 0 deletions