Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 17:26:40 +0000 (09:26 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 17:26:40 +0000 (09:26 -0800)
commite2688f00dc0ceb9d9867434dffbd080411fc23b0
tree433549c6a655ac879654ba82d312911677650380
parent356cebea1123804e4aa85b43ab39bbd0ac8e667c
parenta9925a06ea52a44b4bf4a941342e8240eaf22417
Merge branch 'blk-softirq' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual merge for trivial #include changes
block/ll_rw_blk.c
include/linux/blkdev.h