]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5cf8984cf76aeab7696c87b79bd29f3ab310eeef
tree433549c6a655ac879654ba82d312911677650380
parenta0c706f49ef9382f57ae1c0fe26ae171d9a1a24e
parentd75d04fe6ab8b5d063582c263c93750f8e56e3bf
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