diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-01 00:53:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-01 00:53:30 +0100 |
| commit | f6490438fce5902f840d1f0f905295077c635e7a (patch) | |
| tree | 4b40f6b9d42a6e237b45378206d95cbfddfeaf52 /net/ipv6/xfrm6_input.c | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | x86, ds, bts: cleanup/fix DS configuration (diff) | |
| download | linux-f6490438fce5902f840d1f0f905295077c635e7a.tar.xz linux-f6490438fce5902f840d1f0f905295077c635e7a.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:
x86, ds, bts: cleanup/fix DS configuration
ring-buffer: reset timestamps when ring buffer is reset
trace: set max latency variable to zero on default
trace: stop all recording to ring buffer on ftrace_dump
trace: print ftrace_dump at KERN_EMERG log level
ring_buffer: reset write when reserve buffer fail
tracing/function-graph-tracer: fix a regression while suspend to disk
ring-buffer: fix alignment problem
Diffstat (limited to 'net/ipv6/xfrm6_input.c')
0 files changed, 0 insertions, 0 deletions