Merge tag 'jfs-3.14-rc2' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Feb 2014 18:13:47 +0000 (10:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Feb 2014 18:13:47 +0000 (10:13 -0800)
commitec2e6cb24a92a4a1d43119db3e5bf0b4401d9170
treeed1e2801756fc1b255557c9cd8e972fe37337be9
parent1ccfe6f982674e4b7bd832b904bafcb3db890252
parentc18f7b51200c3c8b76c63e391f9995b65ace9c83
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