]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ed4091 e650c30)
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)
commitd99cf9d679a520d67f81d805b7cb91c68e1847f0
tree415aefe6d168df27c006fcc53b1ea5242eabaaeatree | snapshot
parent7ed40918a386afc2e14a6d3da563ea6d13686c25commit | diff
parente650c305ec3178818b317dad37a6d9c7fa8ba28dcommit | 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 9b847548663ef1039dd49f0eb4463d001e596bc3.

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 2.6 source tree