diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 10:51:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 10:51:50 -0800 |
| commit | 09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2 (patch) | |
| tree | 9859b9ec3b5979af6b177155ef847f97fba19a6a /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent (diff) | |
| download | wireguard-linux-09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2.tar.xz wireguard-linux-09eb3b5b1bcab7b25e9dd57e90ee9753adf7afe2.zip | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ring-buffer: prevent infinite looping on time stamping
ftrace: disable tracing on resize
ftrace: fix breakage in bin_fmt results
ftrace: ftrace.txt version update
ftrace: update txt document
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions