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)
commit4462dc02842698f173f518c1f5ce79c0fb89395a
treeefef7ddcacfd5e119f2ff98e7eb970862d392b6d
parent002baeecf53677d2034113e34197ec221f42e037
parent3d69438031b00c601c991ab447cafb7d5c3c59a6
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