summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_events.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-08 22:21:28 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-08 22:21:28 +0100
commit09d9673d53005fdf40de4c759425893904292236 (patch)
tree0c7b526b3338a5e8541b4da157e2cafaa3a1c1c5 /kernel/trace/trace_events.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
parentalarmtimers: Fix time comparison (diff)
downloadlinux-09d9673d53005fdf40de4c759425893904292236.tar.xz
linux-09d9673d53005fdf40de4c759425893904292236.zip
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: alarmtimers: Fix time comparison ptp: Fix clock_getres() implementation
Diffstat (limited to 'kernel/trace/trace_events.c')
0 files changed, 0 insertions, 0 deletions