diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 17:29:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 17:29:15 -0500 |
| commit | f8effd1a4a1833eac90261d78abacfaefe3d99e4 (patch) | |
| tree | 8ebecce9f6d5b0faf0efc3828b3b353561fd9341 /fs/btrfs/volumes.c | |
| parent | 35010334aa007480a833401b80922299cb1a15ef (diff) | |
| parent | f9aa28adfc6a4b01268ebb6d88566cca8627905f (diff) | |
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:
doc: mmiotrace.txt, buffer size control change
trace: mmiotrace to the tracer menu in Kconfig
mmiotrace: count events lost due to not recording
Diffstat (limited to 'fs/btrfs/volumes.c')
0 files changed, 0 insertions, 0 deletions