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


Trivial merge