diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-13 20:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-13 20:04:50 -0400 |
| commit | 0a49aecaf416377b64d0f03907c2412acbb396be (patch) | |
| tree | a74f3769fdeb1ed46b8495e8ad3d8aa86e63604c /net/netrom/nr_timer.c | |
| parent | 8e8bb96d247fc67eb66a2ebcc6fd45787b5a8b15 (diff) | |
| parent | 8aa8a7c80ccdfac2df5ee48a51a4a7bee2143d4f (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf record: Fix buffer overrun bug in tracepoint_id_to_path()
perf/x86: Fix local vs remote memory events for NHM/WSM
Diffstat (limited to 'net/netrom/nr_timer.c')
0 files changed, 0 insertions, 0 deletions