]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Jan 2012 20:45:57 +0000 (12:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Jan 2012 20:45:57 +0000 (12:45 -0800)
commitb57cea5e332841ed3e11586c88d3940ea4eacbe7
treecd12fd5c2fe293c98a09e8526f2dc5966059a149
parent2437dcbf555bff04e4ee8b8dba4587f946c1cd3d
parent46cd6a7f680d14f6f80ede9f04aeb70fa83bd266
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