From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 23:34:23 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
X-Git-Tag: v3.0~3074
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f3a29dadaf999a273f1e7fe2476595d0283eef3;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

4f3a29dadaf999a273f1e7fe2476595d0283eef3