tree d65f5381024a00982e47fd6144d219bb6b34ff78
parent deac93df26b20cf8438339b5935b5f5643bc30c9
parent a5cb562d6977d9d7989c346b7b153cef31ec0228
author Linus Torvalds <torvalds@linux-foundation.org> 1220986332 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220986332 -0700

Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6

* 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6:
  UBIFS: make minimum fanout 3
  UBIFS: fix division by zero
  UBIFS: amend f_fsid
  UBIFS: fill f_fsid
  UBIFS: improve statfs reporting even more
  UBIFS: introduce LEB overhead
  UBIFS: add forgotten gc_idx_lebs component
  UBIFS: fix assertion
  UBIFS: improve statfs reporting
  UBIFS: remove incorrect index space check
  UBIFS: push empty flash hack down
  UBIFS: do not update min_idx_lebs in stafs
  UBIFS: allow for racing between GC and TNC
  UBIFS: always read hashed-key nodes under TNC mutex
  UBIFS: fix zero-length truncations