tree 66ecb6f516d33915171682cc602af978c0ae014f
parent 31555213f03bca37d2c02e10946296052f4ecfcd
parent 7606f85a701ed8feeac065e133ff9a51c267aa0d
author Linus Torvalds <torvalds@linux-foundation.org> 1320684739 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1320684739 -0800

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