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