tree c45cb3cd1bcaf2d09efeeaec192d344c898f2c70
parent 031af165b1cd295ef04d2bfbcae9bc3cb9180735
parent 167e33c32845a30368463dac5a4fe2be5edcc34a
author Linus Torvalds <torvalds@linux-foundation.org> 1323446844 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323446844 -0800

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: 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"