]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b1542b 8ee1fb9)
Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 17:01:25 +0000 (09:01 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 17:01:25 +0000 (09:01 -0800)
commit98aaf639c507ef7d894097d0786df4f3d2923fa2
tree415aefe6d168df27c006fcc53b1ea5242eabaaeatree | snapshot
parent0b1542b1f34cc2f377ed2f1654741de1446e4f8bcommit | diff
parent8ee1fb97b5a8ba52f77079d1191143acbcddf87bcommit | diff
Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 0941bafd2150ffb58f75d15fddd1c775a775f57a.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/block/nbd.c diff1 | diff2 | blob | history
drivers/message/i2o/i2o_block.c diff1 | diff2 | blob | history
drivers/s390/block/dasd.c diff1 | diff2 | blob | history
drivers/s390/char/tape_block.c diff1 | diff2 | blob | history
drivers/scsi/ata_piix.c diff1 | diff2 | blob | history
drivers/scsi/libata-core.c diff1 | diff2 | blob | history
drivers/scsi/libata-scsi.c diff1 | diff2 | blob | history
include/linux/ata.h diff1 | diff2 | blob | history
include/linux/libata.h diff1 | diff2 | blob | history
include/scsi/scsi_host.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.