diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /fs/reiserfs/README | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/reiserfs/README')
| -rw-r--r-- | fs/reiserfs/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/reiserfs/README b/fs/reiserfs/README index 90e1670e4e6f..14e8c9d460e5 100644 --- a/fs/reiserfs/README +++ b/fs/reiserfs/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | [LICENSING] | 1 | [LICENSING] |
| 2 | 2 | ||
| 3 | ReiserFS is hereby licensed under the GNU General | 3 | ReiserFS is hereby licensed under the GNU General |
| 4 | Public License version 2. | 4 | Public License version 2. |
| @@ -31,7 +31,7 @@ the GPL as not allowing those additional licensing options, you read | |||
| 31 | it wrongly, and Richard Stallman agrees with me, when carefully read | 31 | it wrongly, and Richard Stallman agrees with me, when carefully read |
| 32 | you can see that those restrictions on additional terms do not apply | 32 | you can see that those restrictions on additional terms do not apply |
| 33 | to the owner of the copyright, and my interpretation of this shall | 33 | to the owner of the copyright, and my interpretation of this shall |
| 34 | govern for this license. | 34 | govern for this license. |
| 35 | 35 | ||
| 36 | Finally, nothing in this license shall be interpreted to allow you to | 36 | Finally, nothing in this license shall be interpreted to allow you to |
| 37 | fail to fairly credit me, or to remove my credits, without my | 37 | fail to fairly credit me, or to remove my credits, without my |