tree 45188f0ecb3f4bb7408a7219f8fcd041d500235a
parent 3c355863fb32070a2800f41106519c5c3038623a
parent 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab
author Ingo Molnar <mingo@elte.hu> 1255418691 +0200
committer Ingo Molnar <mingo@elte.hu> 1255418699 +0200

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>