| commit | ee88347755460e8ceb37e8453adcf5fd7ca5ff00 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 22 09:25:55 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 22 09:25:55 2011 -0800 |
| tree | 6a604503807d1a342b4e58ffabe11bd2a26661ff | |
| 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