diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/md/md.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 8b66e04c2ea6..b12b3776c0c0 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -6266,7 +6266,7 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev) | |||
| 6266 | * rt is a sector_t, so could be 32bit or 64bit. | 6266 | * rt is a sector_t, so could be 32bit or 64bit. |
| 6267 | * So we divide before multiply in case it is 32bit and close | 6267 | * So we divide before multiply in case it is 32bit and close |
| 6268 | * to the limit. | 6268 | * to the limit. |
| 6269 | * We scale the divisor (db) by 32 to avoid loosing precision | 6269 | * We scale the divisor (db) by 32 to avoid losing precision |
| 6270 | * near the end of resync when the number of remaining sectors | 6270 | * near the end of resync when the number of remaining sectors |
| 6271 | * is close to 'db'. | 6271 | * is close to 'db'. |
| 6272 | * We then divide rt by 32 after multiplying by db to compensate. | 6272 | * We then divide rt by 32 after multiplying by db to compensate. |