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>

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/ata/libata-scsi.c
Simple merge

diff --cc drivers/ide/ide-cd.c
Simple merge

diff --cc drivers/mmc/card/block.c
index 949e99770ad6f9423c1b30a82a167fc4dceea029,b25e9b6516ae6942d6e9a0c34fc3f0dba0f9556a..c5df86546458d1da54f9a0bd778e7957d2357e2e
--- 1/drivers/mmc/card/block.c
--- 2/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -251,8 -251,16 +251,16 @@@ static int mmc_blk_issue_rq(struct mmc_
                brq.stop.opcode = MMC_STOP_TRANSMISSION;
                brq.stop.arg = 0;
                brq.stop.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
 -              brq.data.blocks = req->nr_sectors;
 +              brq.data.blocks = blk_rq_sectors(req);
  
+               /*
+                * The block layer doesn't support all sector count
+                * restrictions, so we need to be prepared for too big
+                * requests.
+                */
+               if (brq.data.blocks > card->host->max_blk_count)
+                       brq.data.blocks = card->host->max_blk_count;
+ 
                /*
                 * After a read error, we redo the request one sector at a time
                 * in order to accurately determine which sectors can be read

diff --cc drivers/scsi/lpfc/lpfc_scsi.c
Simple merge

diff --cc drivers/scsi/osd/osd_initiator.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc fs/bio.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/fs.h
Simple merge