]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Mar 2006 18:03:05 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 5 Mar 2006 18:03:05 +0000 (10:03 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Always match oplock break (cache notification) to the right tcp


Trivial merge