diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 12:45:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 12:45:57 -0800 |
commit | b57cea5e332841ed3e11586c88d3940ea4eacbe7 (patch) | |
tree | cd12fd5c2fe293c98a09e8526f2dc5966059a149 /crypto/proc.c | |
parent | 2437dcbf555bff04e4ee8b8dba4587f946c1cd3d (diff) | |
parent | 46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 (diff) |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Call perf_cgroup_event_time() directly
perf: Don't call release_callchain_buffers() if allocation fails
Diffstat (limited to 'crypto/proc.c')
0 files changed, 0 insertions, 0 deletions