From: Linus Torvalds Date: Tue, 25 Apr 2006 03:08:08 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=454ac778459bc70f0a9818a6a8fd974ced11de66;p=linux-edison.git Merge /linux/kernel/git/sfrench/cifs-2.6-stable * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable: [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined --- 454ac778459bc70f0a9818a6a8fd974ced11de66