git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b9ed725 279e677)

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	e4b636366c00738b9609cda307014d71b1225b7f
tree	760b67b3624eda62e943e48ce93635c30a5b47bf	tree \| snapshot
parent	b9ed7252d219c1c663944bf03846eabb515dbe75	commit \| diff
parent	279e677faa775ad16e75c32e1bf4a37f8158bc61	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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git