diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:13:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:13:16 -0700 |
| commit | 899edae615c806f78880077bd46f04d7f23ae6e6 (patch) | |
| tree | ae3918d9947a8c4811e86217fc77b3927784492d /net | |
| parent | c8c727db413e18414dc6ebc2cc4f18f390763e17 (diff) | |
| parent | 4177c42a6301a34c20038ec2771a33dcc30bb338 (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, x86: Try to handle unknown nmis with an enabled PMU
perf, x86: Fix handle_irq return values
perf, x86: Fix accidentally ack'ing a second event on intel perf counter
oprofile, x86: fix init_sysfs() function stub
lockup_detector: Sync touch_*_watchdog back to old semantics
tracing: Fix a race in function profile
oprofile, x86: fix init_sysfs error handling
perf_events: Fix time tracking for events with pid != -1 and cpu != -1
perf: Initialize callchains roots's childen hits
oprofile: fix crash when accessing freed task structs
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions