tree 559a8fa8e7a92f8ae0e0a27d4e71f408fa7cec62
parent 38d9aefb5ce8f26358b0d5cd933cfa9e267105b1
parent de0975781a1a8bc92e07eb7681d10ef9bb5e6df9
author Linus Torvalds <torvalds@linux-foundation.org> 1239055219 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239055219 -0700

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

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix recovery bug
  UBIFS: add R/O compatibility
  UBIFS: fix compiler warnings
  UBIFS: fully sort GCed nodes
  UBIFS: fix commentaries
  UBIFS: introduce a helpful variable
  UBIFS: use KERN_CONT
  UBIFS: fix lprops committing bug
  UBIFS: fix bogus assertion
  UBIFS: fix bug where page is marked uptodate when out of space
  UBIFS: amend key_hash return value
  UBIFS: improve find function interface
  UBIFS: list usage cleanup
  UBIFS: fix dbg_chk_lpt_sz()