diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 17:27:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 17:27:09 +0200 |
commit | 44f549217cd26daf7063984ae4ee6e46beca9c41 (patch) | |
tree | 8128955710d052cf2485857e58e616304989b13e /fs/hfs/hfs_fs.h | |
parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
parent | JFS: White space cleanup (diff) | |
download | linux-44f549217cd26daf7063984ae4ee6e46beca9c41.tar.xz 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/hfs/hfs_fs.h')
0 files changed, 0 insertions, 0 deletions