]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge