diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:17:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 18:17:22 -0700 |
| commit | 9f76208c33984ab777eace5d07a4e36e88703e02 (patch) | |
| tree | 2a73304a846ab41ee5366deb6ea511af7ebfbec1 /fs/splice.c | |
| parent | d06be221504189f38950111c214802ada0eb1b71 (diff) | |
| parent | 557055bebe9212dfa6b9f5df811dfd0dac77ec55 (diff) | |
| download | linux-9f76208c33984ab777eace5d07a4e36e88703e02.tar.gz linux-9f76208c33984ab777eace5d07a4e36e88703e02.tar.bz2 linux-9f76208c33984ab777eace5d07a4e36e88703e02.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:
tracing: Fix branch tracer header
tracing: Fix power tracer header
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions