Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Oct 2010 22:03:37 +0000 (15:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Oct 2010 22:03:37 +0000 (15:03 -0700)
commitc6ea21e35bf3691cad59647c771e6606067f627d
tree5723cd61bbc90e7b09aa342350dfb0b7b5576c21
parentf4a3330d76b17239fb34a99d54692248c2d0468c
parentf569599ae70f0899035f8d5876a7939f629c5976
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: prevent infinite recursion in cifs_reconnect_tcon
  cifs: set backing_dev_info on new S_ISREG inodes