From: Linus Torvalds Date: Tue, 14 Jun 2011 18:24:40 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6211b3e1bba952fcd16d477b5dafb1904bac0e48;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] update cifs version to 1.73 [CIFS] trivial cleanup fscache cFYI and cERROR messages cifs: correctly handle NULL tcon pointer in CIFSTCon cifs: show sec= option in /proc/mounts cifs: don't allow cifs_reconnect to exit with NULL socket pointer CIFS: Fix sparse error --- 6211b3e1bba952fcd16d477b5dafb1904bac0e48