Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 May 2010 17:36:16 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 May 2010 17:36:16 +0000 (10:36 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: guard against hardlinking directories


Trivial merge