tree b7af53fa7ca104d30b9759c1f951439af7df3734
parent af8cb8aa38296ecc43aca7fae9e574db7b8ae0c4
parent cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a
author Linus Torvalds <torvalds@linux-foundation.org> 1252964107 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252964107 -0700

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: Fix possible corruption when close races with write
  udf: Perform preallocation only for regular files
  udf: Remove wrong assignment in udf_symlink
  udf: Remove dead code