]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 20:00:11 +0000 (13:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 20:00:11 +0000 (13:00 -0700)
* 'perf-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  x86, perf: Check that current->mm is alive before getting user callchain
  perf_event: Fix broken calc_timer_values()
  perf events: Fix slow and broken cgroup context switch code


Trivial merge