tree efef7ddcacfd5e119f2ff98e7eb970862d392b6d
parent 002baeecf53677d2034113e34197ec221f42e037
parent 3d69438031b00c601c991ab447cafb7d5c3c59a6
author Linus Torvalds <torvalds@linux-foundation.org> 1273772176 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273772176 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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