From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jul 2015 23:28:28 +0000 (-0700)
Subject: Merge tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v4.2-rc3~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f76d94def5605fbec1de61218e91fe1002fd322f;p=karo-tx-linux.git

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
---

f76d94def5605fbec1de61218e91fe1002fd322f