diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-05 04:38:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-05 04:38:30 +0100 |
| commit | 2d941e99dfa2f58f4cf294943274a4f8e264aab7 (patch) | |
| tree | b69e97f05d2fb0fbf1068c5a22f0c8420f7a198e /fs/ocfs2/ocfs2.h | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | [PATCH] blktrace: don't return blktrace_seq from trace_note() (diff) | |
| download | linux-2d941e99dfa2f58f4cf294943274a4f8e264aab7.tar.xz linux-2d941e99dfa2f58f4cf294943274a4f8e264aab7.zip | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] blktrace: don't return blktrace_seq from trace_note()
[PATCH] blktrace: uninline trace_note()
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
0 files changed, 0 insertions, 0 deletions