From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 16:52:19 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
X-Git-Tag: v3.2-rc1~15
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2;p=linux-pvops.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 the dark space calculation
  UBIFS: introduce a helper to dump scanning info
---

cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2