diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:12:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:12:59 -0700 |
| commit | c8c727db413e18414dc6ebc2cc4f18f390763e17 (patch) | |
| tree | a57102fff430d3cb5d2db3a193409850e85047be /kernel/trace/ftrace.c | |
| parent | 4f63e3c5be2ab55d47d89ea1d32d2c27254daf26 (diff) | |
| parent | b9ca67b2ddf021491a3741d9555e8ff59b2175ba (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix lock annotations
fuse: flush background queue on connection close
Diffstat (limited to 'kernel/trace/ftrace.c')
0 files changed, 0 insertions, 0 deletions