]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
* '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()


Trivial merge