diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:27:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 08:27:09 -0700 |
| commit | 44f549217cd26daf7063984ae4ee6e46beca9c41 (patch) | |
| tree | 8128955710d052cf2485857e58e616304989b13e /fs/jfs/jfs_lock.h | |
| parent | 3e04767a4647ea6c61ed05abe803c052ce123960 (diff) | |
| parent | 63f83c9fcf40ab61b75edf5d2f2c1ae6bf876482 (diff) | |
| download | linux-44f549217cd26daf7063984ae4ee6e46beca9c41.tar.gz linux-44f549217cd26daf7063984ae4ee6e46beca9c41.tar.bz2 linux-44f549217cd26daf7063984ae4ee6e46beca9c41.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
JFS: White space cleanup
[PATCH] JFS: return correct error when i-node allocation failed
JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
Diffstat (limited to 'fs/jfs/jfs_lock.h')
| -rw-r--r-- | fs/jfs/jfs_lock.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/jfs/jfs_lock.h b/fs/jfs/jfs_lock.h index 70ac9f7d1e00..7d78e83d7c40 100644 --- a/fs/jfs/jfs_lock.h +++ b/fs/jfs/jfs_lock.h @@ -1,19 +1,19 @@ /* - * Copyright (c) International Business Machines Corp., 2000-2001 - * Portions Copyright (c) Christoph Hellwig, 2001-2002 + * Copyright (C) International Business Machines Corp., 2000-2001 + * Portions Copyright (C) Christoph Hellwig, 2001-2002 * * 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 + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _H_JFS_LOCK |