tree e53027e0283119de0ef4c3a431b1d20cd43003fb
parent c71dd42db2c6f1637b92502a214587431c1a6ad2
parent 6d102bc68f3dd2ae0e305b09170b1751aa67baeb
parent 3d9101e92529e1ff6014f95a69afc82f37b9b13a
author Ingo Molnar <mingo@elte.hu> 1229676160 +0100
committer Ingo Molnar <mingo@elte.hu> 1229676160 +0100

Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core

Conflicts:
	include/linux/ftrace.h