Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jun 2012 18:43:45 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jun 2012 18:43:45 +0000 (11:43 -0700)
commit221d3ebf3ad2c69704e21495e9a936c78d797732
tree49df5243c7fbf2705b5118ae3aae0ed755eee8da
parent9a7c6b73c40e916861eb852dc5855ffb3d58a3cd
parent1df2ae31c724e57be9d7ac00d78db8a5dabdd050
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull UDF fixes from Jan Kara:
 "Make UDF more robust in presence of corrupted filesystem"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Fortify loading of sparing table
  udf: Avoid run away loop when partition table length is corrupted
  udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()