From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Jun 2014 15:39:03 +0000 (-0700)
Subject: Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next
X-Git-Tag: v3.16-rc1~30^2~9
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=daf342af2f7856fd2f5c66b9fb39a8f24986ca53

Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next

Pull jfs changes from Dave Kleikamp.

* tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy:
  fs/jfs/super.c: convert simple_str to kstr
  fs/jfs/jfs_dmap.c: replace min/casting by min_t
  fs/jfs/super.c: remove 0 assignment to static + code clean-up
  fs/jfs/jfs_logmgr.c: remove NULL assignment on static
  JFS: Check for NULL before calling posix_acl_equiv_mode()
  fs/jfs/jfs_inode.c: atomically set inode->i_flags
---

daf342af2f7856fd2f5c66b9fb39a8f24986ca53