Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2008 15:40:11 +0000 (08:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2008 15:40:11 +0000 (08:40 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
  udf: add llseek method
  udf: Fix error paths in udf_new_inode()
  udf: Fix lock inversion between iprune_mutex and alloc_mutex (v2)


Trivial merge