diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:18:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:18:32 +0100 |
| commit | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 (patch) | |
| tree | 2b1052b05fa7615c817894bc9802bc5bb2af7ac1 /kernel/sysctl.c | |
| parent | tracing: Add notrace to TRACE_EVENT implementation functions (diff) | |
| parent | Linux 2.6.33 (diff) | |
| download | linux-dev-64b9fb5704a479d98a59f2a1d45d3331a8f847f8.tar.xz linux-dev-64b9fb5704a479d98a59f2a1d45d3331a8f847f8.zip | |
Merge commit 'v2.6.33' into tracing/core
Conflicts:
scripts/recordmcount.pl
Merge reason: Merge up to v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions