diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/scsi/scsi.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/scsi/scsi.h')
| -rw-r--r-- | drivers/scsi/scsi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h index 5ee5d80a9931..f51e466893e7 100644 --- a/drivers/scsi/scsi.h +++ b/drivers/scsi/scsi.h | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <scsi/scsi_cmnd.h> | 25 | #include <scsi/scsi_cmnd.h> |
| 26 | #include <scsi/scsi_device.h> | 26 | #include <scsi/scsi_device.h> |
| 27 | #include <scsi/scsi_eh.h> | 27 | #include <scsi/scsi_eh.h> |
| 28 | #include <scsi/scsi_request.h> | ||
| 29 | #include <scsi/scsi_tcq.h> | 28 | #include <scsi/scsi_tcq.h> |
| 30 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
| 31 | 30 | ||