diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 14:54:35 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 14:54:35 (GMT) |
commit | cc1b39dbf9f55a438e8a21a694394c20e6a17129 (patch) | |
tree | cf48e5c871250c2bfd1d0590acd2f0569e95b950 /net/netlabel | |
parent | 7e0dd574cd6b1bcc818ed4251e5ceda7d8bee08f (diff) | |
parent | 1c7d66732458dc187008e3f5b2f71e019e320fc2 (diff) | |
download | linux-fsl-qoriq-cc1b39dbf9f55a438e8a21a694394c20e6a17129.tar.xz |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull ftrace updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/netlabel')
0 files changed, 0 insertions, 0 deletions