Merge tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2014 23:49:40 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2014 23:49:40 +0000 (15:49 -0800)
Pull jfs fix from David Kleikamp:
 "Another ACL regression. This one more subtle"

* tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy:
  jfs: set i_ctime when setting ACL


Trivial merge