tree c79b7ddc475fc034d0e944c2a561a3bd5b2d5e9d
parent 842d9b2c6a9189c8954d1d03dadde7403992baed
parent f1d0c998653f1eeec60ee6420e550135b62dbab4
author Linus Torvalds <torvalds@linux-foundation.org> 1295929434 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1295929434 +1000

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()