]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2015 23:28:28 +0000 (16:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jul 2015 23:28:28 +0000 (16:28 -0700)
commite89f37f19bf01cb1b7a10201b98455c88c2d2aba
tree8181de42c62a8a30453bc6c70326a4ff278af726
parentedd0076604bf0dfa254e6f6a6b967f0c3a4da222
parent9d317c308965701a25c669cce3c9f71aee5433df
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
fs/jfs/inode.c
fs/jfs/namei.c