From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Aug 2013 02:22:49 +0000 (-0700)
Subject: Merge tag 'jfs-3.11-rc8' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v3.11~21
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=83c425d222007c8f4ff9f4676572aca5bc54f231;p=linux.git

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

83c425d222007c8f4ff9f4676572aca5bc54f231