diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-26 07:14:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-26 07:14:02 -0400 |
| commit | 5c16d2c813a7490408e966f52b881e70fc8d7f77 (patch) | |
| tree | 3a2a4286a674d2e009f84687b5d0b74809774c28 /kernel/time/ntp.c | |
| parent | 5df414c61e1b6f15bdc3759f292c7404286c9827 (diff) | |
| parent | b8b2663bd7c9da04ac804659b9f617c199d0252c (diff) | |
Merge branch 'tip/perf/ringbuffer-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions