summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-06-09 09:14:34 +0200
committerIngo Molnar <mingo@elte.hu>2011-06-09 09:14:34 +0200
commit5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1 (patch)
tree375df8d09e6397eabd61374f4eb422fac04a22a5 /kernel/trace
parentMerge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentoprofile, dcookies: Fix possible circular locking dependency (diff)
downloadlinux-5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1.tar.xz
linux-5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1.zip
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions