git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2acbaab c5cfbd9)

author	Jens Axboe <jens.axboe@oracle.com>
	Fri, 22 May 2009 18:25:34 +0000 (20:25 +0200)
committer	Jens Axboe <jens.axboe@oracle.com>
	Fri, 22 May 2009 18:25:34 +0000 (20:25 +0200)
commit	531ca7ee105e15e8b6e8ac21666c87ea9743200c
tree	760b67b3624eda62e943e48ce93635c30a5b47bf	tree \| snapshot
parent	2acbaab2c5c8f5abf4789a0b6af988052a99be4b	commit \| diff
parent	c5cfbd9f6502e34ca1322661ad25226397f4532c	commit \| diff

Merge branch 'master' into for-2.6.31

Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

12 files changed:

block/blk-core.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/ide/ide-cd.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/osd/osd_initiator.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sg.c	diff1 \|	diff2 \|	blob \| history
fs/bio.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.