From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Aug 2010 21:37:02 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v2.6.36-rc1~587
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c939f9f9d225972a60181c95df8a9aa50f8b1701;p=~shefty%2Frdma-dev.git

Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix a memory leak on error path.
  UBIFS: fix GC LEB recovery
  UBIFS: use ERR_CAST
  UBIFS: check return code
---

c939f9f9d225972a60181c95df8a9aa50f8b1701