Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2009 21:35:07 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2009 21:35:07 +0000 (14:35 -0700)
commit041d6d0be82bed7e0b87181dba5d10b8ab14afd9
treeb7af53fa7ca104d30b9759c1f951439af7df3734
parentaf8cb8aa38296ecc43aca7fae9e574db7b8ae0c4
parentcbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a
Merge branch 'for_linus' of git://git./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