diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 09:02:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 09:02:20 +0100 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /kernel/dma.c | |
| parent | ftrace: Rename set_bootup_ftrace into set_cmdline_ftrace (diff) | |
| parent | tracing: Remove cpu arg from the rb_time_stamp() function (diff) | |
| download | linux-9de09ace8d518141a4375e1d216ab64db4377799.tar.xz linux-9de09ace8d518141a4375e1d216ab64db4377799.zip | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/dma.c')
0 files changed, 0 insertions, 0 deletions