From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Sep 2009 15:15:18 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33e6c1a0de818d3698cdab27c42915661011319d;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:
  UBIFS: fix debugging dump
  UBIFS: improve lprops dump
  UBIFS: various minor commentary fixes
  UBIFS: improve journal head debugging prints
  UBIFS: define journal head numbers in ubifs-media.h
  UBIFS: amend commentaries
  UBIFS: check ubifs_scan error codes better
  UBIFS: do not print scary error messages needlessly
  UBIFS: add inode size debugging check
  UBIFS: constify file and inode operations
  UBIFS: remove unneeded call from ubifs_sync_fs
  UBIFS: kill BKL
  UBIFS: remove unused functions
  UBIFS: suppress compilation warning
---

33e6c1a0de818d3698cdab27c42915661011319d