summaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-11 10:51:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-11 10:51:50 -0800
commit09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2 (patch)
tree9859b9ec3b5979af6b177155ef847f97fba19a6a /kernel/hrtimer.c
parent04ca2c17e3fae2d3f73aa5ad533242d556cadf5a (diff)
parent45b86a96f17cb2900f291129b0e67287400e45b2 (diff)
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ring-buffer: prevent infinite looping on time stamping ftrace: disable tracing on resize ftrace: fix breakage in bin_fmt results ftrace: ftrace.txt version update ftrace: update txt document
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions