From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 May 2012 21:22:38 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.4~24
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=dfae359f083fac3a884e10b46ebe0f262a9bd97a;p=sfrench%2Fcifs-2.6.git

Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fix from Jeff Layton

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix misspelling of "forcedirectio"
---

dfae359f083fac3a884e10b46ebe0f262a9bd97a