Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2011 04:23:54 +0000 (14:23 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jan 2011 04:23:54 +0000 (14:23 +1000)
commitc723fdab8aa728dc2bf0da6a0de8bb9c3f588d84
treec79b7ddc475fc034d0e944c2a561a3bd5b2d5e9d
parent842d9b2c6a9189c8954d1d03dadde7403992baed
parentf1d0c998653f1eeec60ee6420e550135b62dbab4
Merge git://git./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()