diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
| commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
| tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /fs/smbfs/proc.c | |
| parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/smbfs/proc.c')
| -rw-r--r-- | fs/smbfs/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c index 9468168b9af5..71c29b6670b4 100644 --- a/fs/smbfs/proc.c +++ b/fs/smbfs/proc.c | |||
| @@ -509,7 +509,7 @@ date_unix2dos(struct smb_sb_info *server, | |||
| 509 | month = 2; | 509 | month = 2; |
| 510 | } else { | 510 | } else { |
| 511 | nl_day = (year & 3) || day <= 59 ? day : day - 1; | 511 | nl_day = (year & 3) || day <= 59 ? day : day - 1; |
| 512 | for (month = 0; month < 12; month++) | 512 | for (month = 1; month < 12; month++) |
| 513 | if (day_n[month] > nl_day) | 513 | if (day_n[month] > nl_day) |
| 514 | break; | 514 | break; |
| 515 | } | 515 | } |
