diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/scsi/mpt2sas/mpi/mpi2_init.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/scsi/mpt2sas/mpi/mpi2_init.h')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpi/mpi2_init.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_init.h b/drivers/scsi/mpt2sas/mpi/mpi2_init.h index 20e6b886934..165454d5259 100644 --- a/drivers/scsi/mpt2sas/mpi/mpi2_init.h +++ b/drivers/scsi/mpt2sas/mpi/mpi2_init.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t. | 21 | * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t. |
| 22 | * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO | 22 | * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO |
| 23 | * Control field Task Attribute flags. | 23 | * Control field Task Attribute flags. |
| 24 | * Moved LUN field defines to mpi2.h becasue they are | 24 | * Moved LUN field defines to mpi2.h because they are |
| 25 | * common to many structures. | 25 | * common to many structures. |
| 26 | * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to | 26 | * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to |
| 27 | * Query Asynchronous Event. | 27 | * Query Asynchronous Event. |