diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 09:24:51 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 09:24:59 +0200 |
commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /include/linux/isdn_ppp.h | |
parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
download | op-kernel-dev-2c96c142e941041973faab20ca3b82d57f435c5e.zip op-kernel-dev-2c96c142e941041973faab20ca3b82d57f435c5e.tar.gz |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/isdn_ppp.h')
0 files changed, 0 insertions, 0 deletions