Merge branch 'master' into gfs2

[mv-sheeva.git] / fs / 9p / 9p.h

diff --git a/fs/9p/9p.h b/fs/9p/9p.h
index 2bb89b4005a1b8f7fbff962c9ed09a2f84b4611b..94e2f92ab2e81c754d1af016931b3ed342786498 100644 (file)
--- a/fs/9p/9p.h
+++ b/fs/9p/9p.h
@@ -8,9 +8,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