Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 16:52:19 +0000 (08:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 16:52:19 +0000 (08:52 -0800)
commitcf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2
tree66ecb6f516d33915171682cc602af978c0ae014f
parent31555213f03bca37d2c02e10946296052f4ecfcd
parent7606f85a701ed8feeac065e133ff9a51c267aa0d
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
fs/ubifs/debug.h