Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 May 2012 21:22:38 +0000 (14:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 May 2012 21:22:38 +0000 (14:22 -0700)
commitdfae359f083fac3a884e10b46ebe0f262a9bd97a
tree25a547a4cb2b1cdac99766c62442c1f73bc50582
parent39d6411b7df566715138c8c9f7fa00227f4ae75b
parent531c8ff0d472295f5ef5d1bd306115c81a84889e
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"