summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-05 12:09:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-05 12:09:48 -0700
commit45175476ae2dbebc860d5cf486f2916044343513 (patch)
tree9002f57513ecd3780e07a7c54443d05d081806dd /crypto
parent2dd1cb5a7ea7aa0d3f7f36baa48aae3725655647 (diff)
parent83ff59a066637a6c28844bbf43009459408240f4 (diff)
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
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions