Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.osdl.org>
Tue, 5 Dec 2006 03:38:30 +0000 (19:38 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Tue, 5 Dec 2006 03:38:30 +0000 (19:38 -0800)
commit2d941e99dfa2f58f4cf294943274a4f8e264aab7
treeb69e97f05d2fb0fbf1068c5a22f0c8420f7a198e
parent651857a1ecaf97a8ad9d324dd2a61675c53e541e
parenta863055b1066be1b8e1107f71be01daeed6bde31
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()