summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-18 15:49:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-18 15:49:40 -0800
commit341bbdc512633592198e6b434ca99a29bab7e02a (patch)
tree0530cd642156b9da3f768fb663f1e90a73134924 /block/blk-merge.c
parent805937cf45f9a9933e6b8e5c6660406e977a9a23 (diff)
parent844fa1b5f8493cff4b976fa7a5b9ebeeafdd75cc (diff)
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
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions