From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Dec 2010 17:20:21 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
X-Git-Tag: v2.6.37-rc5~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88063dd69b124721e18a59535d4f35266fcb867f;p=thirdparty%2Fkernel%2Flinux.git

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

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: fix corrupted PEB detection for NOR flash
---

88063dd69b124721e18a59535d4f35266fcb867f