From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Feb 2014 18:13:47 +0000 (-0800)
Subject: Merge tag 'jfs-3.14-rc2' of git://github.com/kleikamp/linux-shaggy
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ec2e6cb24a92a4a1d43119db3e5bf0b4401d9170;p=deliverable%2Flinux.git

Merge tag 'jfs-3.14-rc2' of git://github.com/kleikamp/linux-shaggy

Pull jfs fix from David Kleikamp:
 "Fix regression"

* tag 'jfs-3.14-rc2' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix generic posix ACL regression
---

ec2e6cb24a92a4a1d43119db3e5bf0b4401d9170