diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 12:04:41 +0100 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /include/linux/nfsd/nfsd.h | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
| download | op-kernel-dev-b17304245f0db0ac69b795c411407808f3f2796d.zip op-kernel-dev-b17304245f0db0ac69b795c411407808f3f2796d.tar.gz | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'include/linux/nfsd/nfsd.h')
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 2126940..e19f459 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -23,7 +23,6 @@ /* * nfsd version */ -#define NFSD_VERSION "0.5" #define NFSD_SUPPORTED_MINOR_VERSION 0 /* |
