Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Dec 2010 17:20:21 +0000 (09:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Dec 2010 17:20:21 +0000 (09:20 -0800)
commit88063dd69b124721e18a59535d4f35266fcb867f
treede699d61190284c91803d48ab22512910c23c720
parentdf9d38ebda762e54ed0b142c2c47b2f57a145ab2
parent7ac760c2f78ddd8e1bd633767b01becfbbf96720
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