tree 42b2d22e0dc9ae08a26167ba8f89cb3d9a8ad5af
parent a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
parent 468a15bb4cc61694495cc5ed7ffca29e87c79b69
parent 67be403d897f818b1a5ecc201967b0ee6a0332f9
parent 98db8df777438e16ad0f44a0fba05ebbdb73db8d
parent 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
author Ingo Molnar <mingo@elte.hu> 1230207060 +0100
committer Ingo Molnar <mingo@elte.hu> 1230207060 +0100

Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core