lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into for-linus

Browse Source 
Conflicts:
	block/Kconfig

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2010-03-19 08:05:10 +01:00
parent e9ce335df5 a3d3203e4b
commit b4b7a4ef09
1756 changed files with 63830 additions and 49248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/sd.c
View File

@@ -2111,7 +2111,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
* which is followed by sdaaa.
*
* This is basically 26 base counting with one extra 'nil' entry
* at the beggining from the second digit on and can be
* at the beginning from the second digit on and can be
* determined using similar method as 26 base conversion with the
* index shifted -1 after each digit is computed.
*