tree 213de429f7081469632f27f57052d71999fee5e5
parent c939f9f9d225972a60181c95df8a9aa50f8b1701
parent 64d4b4c90a876401e503c3a3260e9d0ed066f271
author Linus Torvalds <torvalds@linux-foundation.org> 1280871446 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280871446 -0700

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

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: do not warn unnecessarily
  UBI: do not print message about corruptes PEBs if we have none of them
  UBI: improve delete-compatible volumes handling
  UBI: fix error message and compilation warnings
  UBI: generate random image_seq when formatting MTD devices
  UBI: improve ECC error message
  UBI: improve corrupted flash handling
  UBI: introduce eraseblock counter variables
  UBI: introduce a new IO return code
  UBI: simplify IO error codes