projects / linux-flexiantxendom0-3.2.10.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 39d6411 531c8ff)
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)
Pull CIFS fix from Jeff Layton

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


Trivial merge
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)