From: Linus Torvalds Date: Tue, 25 Jan 2011 04:23:54 +0000 (+1000) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: v2.6.38-rc3~63 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84;p=linux-pvops.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: Make CIFS mount work in a container. CIFS: Remove pointless variable assignment in cifs_dfs_do_automount() --- c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84