Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Aug 2010 21:37:02 +0000 (14:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Aug 2010 21:37:02 +0000 (14:37 -0700)
commitc939f9f9d225972a60181c95df8a9aa50f8b1701
tree06f7621294bab5862ca15fa8c3749edcfc1ead3c
parentb8b3e9058f0f1d5c5a81c7d3d46f373d5f59a82c
parentc18de72fb3c72fdc5ca883910761af3f14d90d76
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