tree 3776499f6edc95a36533c7efe32a7b6038c88b61
parent 06d362931a530e0d48c1a9554a752da4ed240f0b
parent 45aafd32996e27bfc4862654ff31231bdddbe200
author Linus Torvalds <torvalds@linux-foundation.org> 1287790463 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287790463 -0700

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

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: tighten the corrupted PEB criteria
  UBI: fix check_data_ff return code
  UBI: remember copy_flag while scanning
  UBI: preserve corrupted PEBs
  UBI: add truly corrupted PEBs to corrupted list
  UBI: introduce debugging helper function
  UBI: make check_pattern function non-static
  UBI: do not put eraseblocks to the corrupted list unnecessarily
  UBI: separate out corrupted list
  UBI: change cascade of ifs to switch statements
  UBI: rename a local variable
  UBI: handle bit-flips when no header found
  UBI: remove duplicate IO error codes
  UBI: rename IO error code
  UBI: fix small 80 characters limit style issue
  UBI: cleanup and simplify Kconfig