From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Tue, 5 Dec 2006 03:38:30 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.20-rc1~34^2~40^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d941e99dfa2f58f4cf294943274a4f8e264aab7;p=linux-2.6

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()
---

2d941e99dfa2f58f4cf294943274a4f8e264aab7