Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-09-23 07:40:53 -07:00

parent eb0e007687 438282d85d

commit bfab08c097

4 changed files with 14 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

fs/jfs/inode.c

View file

2

fs/jfs/jfs_dmap.c

View file

15

fs/jfs/jfs_txnmgr.c

View file

1

fs/jfs/jfs_txnmgr.h

View file