| commit | 2d941e99dfa2f58f4cf294943274a4f8e264aab7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Mon Dec 04 19:38:30 2006 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Mon Dec 04 19:38:30 2006 -0800 |
| tree | b69e97f05d2fb0fbf1068c5a22f0c8420f7a198e | |
| parent | 651857a1ecaf97a8ad9d324dd2a61675c53e541e [diff] | |
| parent | a863055b1066be1b8e1107f71be01daeed6bde31 [diff] |
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()