From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Feb 2014 23:49:40 +0000 (-0800)
Subject: Merge tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v3.14-rc4~32
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=341bbdc512633592198e6b434ca99a29bab7e02a;p=karo-tx-linux.git

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

341bbdc512633592198e6b434ca99a29bab7e02a