diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 13:27:32 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 13:28:41 +0400 |
commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
tree | 739063990a8077b29ef97e69d73bce94573daae4 /drivers/pps/kapi.c | |
parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
download | linux-929bf0d0156562ce631728b6fa53d68004d456d2.tar.xz |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pps/kapi.c')
0 files changed, 0 insertions, 0 deletions