tree 166c745d962703bc93a1197a1c08fa45eac3b292
parent ebff7c92ab60faa3f047d36cced2f1592a92da31
parent e8a80c6f769dd4622d8b211b398452158ee60c0b
author Linus Torvalds <torvalds@linux-foundation.org> 1299124847 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299124847 -0800

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  ext2: Fix link count corruption under heavy link+rename load