]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2014 15:39:03 +0000 (08:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2014 15:39:03 +0000 (08:39 -0700)
commit78214d895e72a0a18659e822fb616917f842d948
tree9cb74ca3ea975e36afb7dbfe6c76b6805485e8b3
parentf219fd376f5ed3c8020b1fdbfb5b788b9c3f2714
parenta61d19e6ba0b390b70cf1eab395c0a0907e14a1e
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