]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 00:22:50 +0000 (16:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 00:22:50 +0000 (16:22 -0800)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: use ext2_find_next_bit
  udf: Do not read inode before writing it
  udf: Fix unalloc space handling in udf_update_inode

1  2 
fs/udf/inode.c

diff --cc fs/udf/inode.c
Simple merge