diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/jfs/jfs_dtree.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'fs/jfs/jfs_dtree.h')
| -rw-r--r-- | fs/jfs/jfs_dtree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_dtree.h b/fs/jfs/jfs_dtree.h index af8513f78648..8561c6ecece0 100644 --- a/fs/jfs/jfs_dtree.h +++ b/fs/jfs/jfs_dtree.h | |||
| @@ -35,7 +35,7 @@ typedef union { | |||
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * entry segment/slot | 38 | * entry segment/slot |
| 39 | * | 39 | * |
| 40 | * an entry consists of type dependent head/only segment/slot and | 40 | * an entry consists of type dependent head/only segment/slot and |
| 41 | * additional segments/slots linked vi next field; | 41 | * additional segments/slots linked vi next field; |