cd87d74922099ac22
parent 4c7fd114c65830cb052b6f3d0ab5b11626e64d5d
parent 69102e9b4b61f56a26717659ec2e572a6b18458d
author Linus Torvalds <torvalds@linux-foundation.org> 1299195479 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299195479 -0800

Merge branch 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'i_nlink' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  hfs: fix rename() over non-empty directory
  udf: fix i_nlink limit
  fix reiserfs mkdir() breakage
  exofs: i_nlink races in rename()
  nilfs2: i_nlink races in rename()
  minix: i_nlink races in rename()
  ufs: i_nlink races in rename()
  sysv: i_nlink races in rename()