From: Linus Torvalds Date: Mon, 14 Sep 2009 21:33:13 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: v2.6.32-rc1~701 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6cdb5930a6fa0e35b236f4aa0e056001fe1384b4;p=linux-2.6-block.git Merge git://git./linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: consolidate reconnect logic in smb_init routines cifs: Replace wrtPending with a real reference count cifs: protect GlobalOplock_Q with its own spinlock cifs: use tcon pointer in cifs_show_options cifs: send IPv6 addr in upcall with colon delimiters [CIFS] Fix checkpatch warnings PATCH] cifs: fix broken mounts when a SSH tunnel is used (try #4) [CIFS] Memory leak in ntlmv2 hash calculation [CIFS] potential NULL dereference in parse_DFS_referrals() --- 6cdb5930a6fa0e35b236f4aa0e056001fe1384b4