diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-30 00:18:49 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-30 00:18:49 +0200 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /fs/9p/error.c | |
| parent | [PATCH] libata: add FIXME above ata_dev_xfermask() (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.tar.xz linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.zip | |
Merge branch 'master'
Diffstat (limited to 'fs/9p/error.c')
| -rw-r--r-- | fs/9p/error.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/9p/error.c b/fs/9p/error.c index e4b6f8f38b6f..981fe8ecd780 100644 --- a/fs/9p/error.c +++ b/fs/9p/error.c @@ -11,9 +11,8 @@ * Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov> * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of |