tree 55084d3d51708f90f27d0a70db5ab63916942f14
parent eb02ce017dd83985041a7e54c6449f92d53b026f
parent 80a04d3f2f94fb68b5df05e3ac6697130bc3467a
author Ingo Molnar <mingo@elte.hu> 1239660136 +0200
committer Ingo Molnar <mingo@elte.hu> 1239660142 +0200

Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

Signed-off-by: Ingo Molnar <mingo@elte.hu>