tree 675baee9b37bf8a1d4322153cd3259229b7431f0
parent 5b10b9a787a981259cca213c8bf1c79333c3c67e
parent e77e6f3be93763ef88ccbaa9e0ebda5360d92f7c
author Linus Torvalds <torvalds@g5.osdl.org> 1141581785 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141581785 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable

* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Always match oplock break (cache notification) to the right tcp