Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index c0a254b89a30..d41ce380eedc 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -294,6 +294,12 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
                         cmd_entry->control_flags = CF_WRITE;
                 else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
                         cmd_entry->control_flags = CF_READ;
+
+                ha->bytes_xfered += cmd->request_bufflen;
+                if (ha->bytes_xfered & ~0xFFFFF){
+                        ha->total_mbytes_xferred += ha->bytes_xfered >> 20;
+                        ha->bytes_xfered &= 0xFFFFF;
+                }
         }
 
         /* Set tagged queueing control flags */