Merge tag 'jfs-3.11-rc8' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Aug 2013 02:22:49 +0000 (19:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Aug 2013 02:22:49 +0000 (19:22 -0700)
commit83c425d222007c8f4ff9f4676572aca5bc54f231
tree9e51159b39d0f1220d7b1f8fc741ab7b8ad5cc31
parentd8dfad3876e4386666b759da3c833d62fb8b2267
parent44512449c0ab368889dd13ae0031fba74ee7e1d2
Merge tag 'jfs-3.11-rc8' of git://github.com/kleikamp/linux-shaggy

Pull jfs fix from Dave Kleikamp:
 "One JFS patch to fix an incompatibility with NFSv4 resulting in the
  nfs client reporting a readdir loop"

* tag 'jfs-3.11-rc8' of git://github.com/kleikamp/linux-shaggy:
  jfs: fix readdir cookie incompatibility with NFSv4