diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/scsi/sd.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 1dd4d8407694..83881dfb33c0 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -2111,7 +2111,7 @@ static int sd_revalidate_disk(struct gendisk *disk) | |||
| 2111 | * which is followed by sdaaa. | 2111 | * which is followed by sdaaa. |
| 2112 | * | 2112 | * |
| 2113 | * This is basically 26 base counting with one extra 'nil' entry | 2113 | * This is basically 26 base counting with one extra 'nil' entry |
| 2114 | * at the beggining from the second digit on and can be | 2114 | * at the beginning from the second digit on and can be |
| 2115 | * determined using similar method as 26 base conversion with the | 2115 | * determined using similar method as 26 base conversion with the |
| 2116 | * index shifted -1 after each digit is computed. | 2116 | * index shifted -1 after each digit is computed. |
| 2117 | * | 2117 | * |