diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
| commit | 86579dd06deecfa6ac88d5e84e4d63c397cd6f6d (patch) | |
| tree | b4475d3ccde53015ad84a06e4e55e64591171b75 /fs/9p/error.h | |
| parent | 7ea9ea832212c4a755650f7c7cc1ff0b63292a41 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/9p/error.h')
| -rw-r--r-- | fs/9p/error.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/9p/error.h b/fs/9p/error.h index a9794e85fe51..5f3ca522b316 100644 --- a/fs/9p/error.h +++ b/fs/9p/error.h | |||
| @@ -12,9 +12,8 @@ | |||
| 12 | * Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov> | 12 | * Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov> |
| 13 | * | 13 | * |
| 14 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
| 15 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License version 2 |
| 16 | * the Free Software Foundation; either version 2 of the License, or | 16 | * as published by the Free Software Foundation. |
| 17 | * (at your option) any later version. | ||
| 18 | * | 17 | * |
| 19 | * This program is distributed in the hope that it will be useful, | 18 | * This program is distributed in the hope that it will be useful, |
| 20 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |