From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jul 2012 22:53:06 +0000 (-0700)
Subject: Merge tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubi
X-Git-Tag: v3.6-rc1~149
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce447f34a7696268d1c7a7c44a0d5ef7a8176491;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubi

Pull UBI changes from Artem Bityutskiy:
 "Change the default amount of eraseblocks which UBI reserves for bad
  block handling from 1% to 2%, because 1% does not meet most modern
  flash requirements.  1% was good enough in the past for old
  high-quality SLCs, but nowadays 2% is much more appropriate.:

Other changes are clean-ups.

* tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubi:
  UBI: harmonize the update of ubi->beb_rsvd_pebs
  UBI: trivial: fix comment of ubi_calculate_reserved function
  UBI: fix spelling of detach in debug output
  UBI: Change the default percentage of reserved PEB
---

ce447f34a7696268d1c7a7c44a0d5ef7a8176491