From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 18:51:07 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=eb08d8ff476ad39a149e1044c7d3fd742a168864;p=openwrt%2Fstaging%2Fblogic.git

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

* 'linux-next' of git://git.infradead.org/ubifs-2.6: (52 commits)
  UBIFS: switch to dynamic printks
  UBIFS: fix kernel-doc comments
  UBIFS: fix extremely rare mount failure
  UBIFS: simplify LEB recovery function further
  UBIFS: always cleanup the recovered LEB
  UBIFS: clean up LEB recovery function
  UBIFS: fix-up free space on mount if flag is set
  UBIFS: add the fixup function
  UBIFS: add a superblock flag for free space fix-up
  UBIFS: share the next_log_lnum helper
  UBIFS: expect corruption only in last journal head LEBs
  UBIFS: synchronize write-buffer before switching to the next bud
  UBIFS: remove BUG statement
  UBIFS: change bud replay function conventions
  UBIFS: substitute the replay tree with a replay list
  UBIFS: simplify replay
  UBIFS: store free and dirty space in the bud replay entry
  UBIFS: remove unnecessary stack variable
  UBIFS: double check that buds are replied in order
  UBIFS: make 2 functions static
  ...
---

eb08d8ff476ad39a149e1044c7d3fd742a168864