Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2011 22:29:37 +0000 (14:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2011 22:29:37 +0000 (14:29 -0800)
commit335bc70b6b5fdc9b4e28cb56c27f10124064f9da
tree7f5a1594a09cdcb2ea9a5d768ea72c0256f6aa3c
parent404cbbd52f10d1d5719ad82ce8ba903890779255
parent66832eb4baaaa9abe4c993ddf9113a79e39b9915
Merge branch 'perf-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Validate cpu early in perf_event_alloc()
  perf: Find_get_context: fix the per-cpu-counter check
  perf: Fix contexted inheritance
kernel/perf_event.c