From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 17:26:40 +0000 (-0800)
Subject: Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.16-rc1~672
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2688f00dc0ceb9d9867434dffbd080411fc23b0;p=pandora-kernel.git

Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual merge for trivial #include changes
---

e2688f00dc0ceb9d9867434dffbd080411fc23b0
Reading git-diff-tree failed