diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 11:40:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 11:40:18 +0300 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /arch/powerpc/platforms/pseries/plpar_wrappers.h | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
| download | linux-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.tar.xz | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
Diffstat (limited to 'arch/powerpc/platforms/pseries/plpar_wrappers.h')
0 files changed, 0 insertions, 0 deletions