diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /fs/fat/misc.c | |
parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) |
Merge with Linux 2.3.41.
Diffstat (limited to 'fs/fat/misc.c')
-rw-r--r-- | fs/fat/misc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fat/misc.c b/fs/fat/misc.c index cd2762732..196e7aa1b 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -338,7 +338,6 @@ int date_dos2unix(unsigned short time,unsigned short date) month < 2 ? 1 : 0)+3653); /* days since 1.1.70 plus 80's leap day */ secs += sys_tz.tz_minuteswest*60; - if (sys_tz.tz_dsttime) secs -= 3600; return secs; } |