From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 May 2010 17:36:16 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench... 
X-Git-Tag: v2.6.34~21
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=4462dc02842698f173f518c1f5ce79c0fb89395a

Merge branch 'for-linus' of git://git./linux/kernel/git/sfrench/cifs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: guard against hardlinking directories
---

4462dc02842698f173f518c1f5ce79c0fb89395a