diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 04:34:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-29 04:34:29 -0400 |
| commit | f71bb0ac5e85410601b0db29d7b1635345ea61a4 (patch) | |
| tree | 7c3ef70ef008db87d8b71e5de0632766ecd64d2f /kernel/timer.c | |
| parent | 7285dd7fd375763bfb8ab1ac9cf3f1206f503c16 (diff) | |
| parent | a42548a18866e87092db93b771e6c5b060d78401 (diff) | |
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 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions