diff options
author | 2011-02-22 09:25:55 -0800 | |
---|---|---|
committer | 2011-02-22 09:25:55 -0800 | |
commit | ee88347755460e8ceb37e8453adcf5fd7ca5ff00 (patch) | |
tree | 6a604503807d1a342b4e58ffabe11bd2a26661ff /net/unix/af_unix.c | |
parent | Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
parent | perf: Fix throttle logic (diff) | |
download | wireguard-linux-ee88347755460e8ceb37e8453adcf5fd7ca5ff00.tar.xz wireguard-linux-ee88347755460e8ceb37e8453adcf5fd7ca5ff00.zip |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions