summaryrefslogtreecommitdiff
path: root/net/netlabel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-12-08 14:54:35 (GMT)
committerIngo Molnar <mingo@kernel.org>2012-12-08 14:54:35 (GMT)
commitcc1b39dbf9f55a438e8a21a694394c20e6a17129 (patch)
treecf48e5c871250c2bfd1d0590acd2f0569e95b950 /net/netlabel
parent7e0dd574cd6b1bcc818ed4251e5ceda7d8bee08f (diff)
parent1c7d66732458dc187008e3f5b2f71e019e320fc2 (diff)
downloadlinux-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