Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <[email protected]>
Tue, 25 Jan 2011 04:23:54 +0000 (14:23 +1000)
committerLinus Torvalds <[email protected]>
Tue, 25 Jan 2011 04:23:54 +0000 (14:23 +1000)
* 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()


Trivial merge