From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Nov 2012 19:28:43 +0000 (-0800)
Subject: Merge tag 'upstream-3.7-rc6' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v3.7-rc6~16
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=ce95a36bb9dd8bb5de49e69b27238da2f415f230

Merge tag 'upstream-3.7-rc6' of git://git.infradead.org/linux-ubifs

Pull UBIFS fixes from Artem Bityutskiy:
 "Two patches which fix a problem reported by several people in the
  past, but only fixed now because no one gave enough material for
  debugging.

  Anyway, these fix the problem that sometimes after a power cut the
  file-system is not mountable with the following symptom:

	grab_empty_leb: could not find an empty LEB

  The fixes make the file-system mountable again."

* tag 'upstream-3.7-rc6' of git://git.infradead.org/linux-ubifs:
  UBIFS: fix mounting problems after power cuts
  UBIFS: introduce categorized lprops counter
---

ce95a36bb9dd8bb5de49e69b27238da2f415f230