tree 06f7621294bab5862ca15fa8c3749edcfc1ead3c
parent b8b3e9058f0f1d5c5a81c7d3d46f373d5f59a82c
parent c18de72fb3c72fdc5ca883910761af3f14d90d76
author Linus Torvalds <torvalds@linux-foundation.org> 1280871422 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280871422 -0700

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