From: Linus Torvalds Date: Sun, 5 Mar 2006 18:03:05 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable X-Git-Tag: v2.6.16-rc6~113 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=24ed6e2c7894350d9bc06a559d3c23338ecf3323;p=linux-2.6-omap-h63xx.git 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 --- 24ed6e2c7894350d9bc06a559d3c23338ecf3323