diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 10:34:18 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 10:34:29 +0200 |
commit | f71bb0ac5e85410601b0db29d7b1635345ea61a4 (patch) | |
tree | 7c3ef70ef008db87d8b71e5de0632766ecd64d2f /scripts/markup_oops.pl | |
parent | clocksource: Resolve cpu hotplug dead lock with TSC unstable (diff) | |
parent | cputime: Optimize jiffies_to_cputime(1) (diff) | |
download | linux-f71bb0ac5e85410601b0db29d7b1635345ea61a4.tar.xz linux-f71bb0ac5e85410601b0db29d7b1635345ea61a4.zip |
Merge branch 'timers/posixtimers' into timers/tracing
Merge reason: timer tracepoint patches depend on both branches
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts/markup_oops.pl')
0 files changed, 0 insertions, 0 deletions