tree 25a547a4cb2b1cdac99766c62442c1f73bc50582
parent 39d6411b7df566715138c8c9f7fa00227f4ae75b
parent 531c8ff0d472295f5ef5d1bd306115c81a84889e
author Linus Torvalds <torvalds@linux-foundation.org> 1337203358 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1337203358 -0700

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"