diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 09:25:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-22 09:25:55 -0800 |
| commit | ee88347755460e8ceb37e8453adcf5fd7ca5ff00 (patch) | |
| tree | 6a604503807d1a342b4e58ffabe11bd2a26661ff /kernel/ptrace.c | |
| parent | 609b06f33506d92693cb89c303026f830f769c0d (diff) | |
| parent | 4fe757dd48a9e95e1a071291f15dda5421dacb66 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/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: Fix throttle logic
perf, x86: P4 PMU: Fix spurious NMI messages
Diffstat (limited to 'kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions