Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 16:07:24 +0000 (08:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Dec 2011 16:07:24 +0000 (08:07 -0800)
commit975e32c287a9b144cf115d3f42ca18664b3331df
treec45cb3cd1bcaf2d09efeeaec192d344c898f2c70
parent031af165b1cd295ef04d2bfbcae9bc3cb9180735
parent167e33c32845a30368463dac5a4fe2be5edcc34a
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Do no try to schedule task events if there are none
  lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
  perf header: Use event_name() to get an event name
  perf stat: Failure with "Operation not supported"