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)
commit341bbdc512633592198e6b434ca99a29bab7e02a
tree0530cd642156b9da3f768fb663f1e90a73134924
parent805937cf45f9a9933e6b8e5c6660406e977a9a23
parent844fa1b5f8493cff4b976fa7a5b9ebeeafdd75cc
Merge tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy

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