From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jul 2013 19:09:48 +0000 (-0700)
Subject: Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi
X-Git-Tag: v3.11-rc1~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45175476ae2dbebc860d5cf486f2916044343513;p=platform%2Fkernel%2Flinux-stable.git

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

Pull ubi fixes from Artem Bityutskiy:
 "A couple of fixes and clean-ups, allow for assigning user-defined UBI
  device numbers when attaching MTD devices by using the "mtd=" module
  parameter"

* tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi:
  UBI: support ubi_num on mtd.ubi command line
  UBI: fastmap break out of used PEB search
  UBI: document UBI_IOCVOLUP better in user header
  UBI: do not abort init when ubi.mtd devices cannot be found
  UBI: drop redundant "UBI error" string
---

45175476ae2dbebc860d5cf486f2916044343513