| commit | f76d94def5605fbec1de61218e91fe1002fd322f | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 16 Jul 2015 23:28:28 +0000 (16 16:28 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 16 Jul 2015 23:28:28 +0000 (16 16:28 -0700) | ||
| tree | 8181de42c62a8a30453bc6c70326a4ff278af726 | treesnapshot (tar.gz zip) |
| parent | 3aa20508a6fe386c2a893027ef4c4ef78ee4eac2 | commitdiff |
| parent | 26456955719b79cc4a011b18221aa68f599f6b6c | commitdiff |
Merge tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy
Pull jfs fixes from David Kleikamp:
"A couple trivial fixes and an error path fix"
* tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy:
jfs: clean up jfs_rename and fix out of order unlock
jfs: fix indentation on if statement
jfs: removed a prohibited space after opening parenthesis
Pull jfs fixes from David Kleikamp:
"A couple trivial fixes and an error path fix"
* tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy:
jfs: clean up jfs_rename and fix out of order unlock
jfs: fix indentation on if statement
jfs: removed a prohibited space after opening parenthesis
| fs/jfs/inode.c | diff1 | diff2 | blobhistory |
| fs/jfs/namei.c | diff1 | diff2 | blobhistory |