Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Dec 2009 19:56:24 +0000 (11:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Dec 2009 19:56:24 +0000 (11:56 -0800)
commit952363c90c93e967c8e1819131b68cbb6f9c962f
treed68303e8615d56cff385ee1331ab536994e8096f
parent2d959e95658a0224b0dd0d787926d5ffc95f9574
parent05cbaa2853cdfc255fdd04e65a82bfe9208c4e52
Merge branch 'perf-fixes-for-linus-2' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix NULL deref in inheritance code
  perf: Pass appropriate frame pointer to dump_trace()
kernel/perf_event.c