From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jun 2012 18:43:45 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=221d3ebf3ad2c69704e21495e9a936c78d797732;p=~shefty%2Frdma-dev.git

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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()
---

221d3ebf3ad2c69704e21495e9a936c78d797732