From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jun 2011 22:59:32 +0000 (+0900)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3af91a1256b628d55913324d27fe747c69566749;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-up free space earlier
  UBIFS: intialize LPT earlier
  UBIFS: assert no fixup when writing a node
  UBIFS: fix clean znode counter corruption in error cases
  UBIFS: fix memory leak on error path
  UBIFS: fix shrinker object count reports
  UBIFS: fix recovery broken by the previous recovery fix
  UBIFS: amend ubifs_recover_leb interface
  UBIFS: introduce a "grouped" journal head flag
  UBIFS: supress false error messages
---

3af91a1256b628d55913324d27fe747c69566749