diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /include/pcmcia/version.h | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'include/pcmcia/version.h')
| -rw-r--r-- | include/pcmcia/version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia/version.h b/include/pcmcia/version.h index 4f6ffc702..70f3d8a48 100644 --- a/include/pcmcia/version.h +++ b/include/pcmcia/version.h @@ -1,4 +1,4 @@ -/* version.h 1.83 2000/02/03 02:16:14 (David Hinds) */ +/* version.h 1.92 2000/07/21 18:26:56 (David Hinds) */ -#define CS_RELEASE "3.1.11" -#define CS_RELEASE_CODE 0x310b +#define CS_RELEASE "3.1.20" +#define CS_RELEASE_CODE 0x3115 |