Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2009 20:50:25 +0000 (12:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Dec 2009 20:50:25 +0000 (12:50 -0800)
commit3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
tree5d5920258fc8e3bafd16fddf5fb92f9ec0bb3cc1
parent75b08038ceb62f3bd8935346679920f97c3cf9f6
parent2c948b3f86e5f0327e2e57858600af6e6f0ae29a
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: Avoid IO in udf_clear_inode
  udf: Try harder when looking for VAT inode
  udf: Fix compilation with UDFFS_DEBUG enabled