diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 11:56:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 11:56:24 -0800 |
commit | 952363c90c93e967c8e1819131b68cbb6f9c962f (patch) | |
tree | d68303e8615d56cff385ee1331ab536994e8096f /kernel/time/timer_list.c | |
parent | 2d959e95658a0224b0dd0d787926d5ffc95f9574 (diff) | |
parent | 05cbaa2853cdfc255fdd04e65a82bfe9208c4e52 (diff) |
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'kernel/time/timer_list.c')
0 files changed, 0 insertions, 0 deletions