diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-07-25 21:58:48 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-07-25 21:58:48 +0200 |
| commit | 8407884dd9164ec18ed2afc00f56b87e36c51fcf (patch) | |
| tree | b6ea42c231d7d39f454de28a068d78ce11709770 /drivers/s390/scsi/zfcp_cfdc.c | |
| parent | sata_dwc_460ex: device tree may specify dma_channel (diff) | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| download | linux-8407884dd9164ec18ed2afc00f56b87e36c51fcf.tar.xz linux-8407884dd9164ec18ed2afc00f56b87e36c51fcf.zip | |
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield
list in struct scsi_device. Resolve that conflict
by including both bits.
Conflicts:
include/scsi/scsi_device.h
Diffstat (limited to 'drivers/s390/scsi/zfcp_cfdc.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_cfdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c index fab2c2592a97..fbd8b4db6025 100644 --- a/drivers/s390/scsi/zfcp_cfdc.c +++ b/drivers/s390/scsi/zfcp_cfdc.c @@ -5,7 +5,7 @@ * Access Control Lists / Control File Data Channel; * handling of response code and states for ports and LUNs. * - * Copyright IBM Corporation 2008, 2010 + * Copyright IBM Corp. 2008, 2010 */ #define KMSG_COMPONENT "zfcp" |