tree 7c41ea5bff8ef69b0ba600b74980e590e3be17dd
parent 56635f7e6197404d7363f8dcaa7a97abf57276fb
parent f2863c54f30cccb50661697a6e4bdcd0ad0b0a6c
author Linus Torvalds <torvalds@linux-foundation.org> 1230940646 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1230940646 -0800

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

* 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6:
  UBI: fix checkpatch.pl warnings
  UBI: simplify PEB protection code
  UBI: prepare for protection tree improvements
  UBI: return -ENOMEM upon failing vmalloc
  UBI: document UBI ioctls
  UBI: handle write errors in WL worker
  UBI: fix error path
  UBI: some code re-structuring
  UBI: fix deadlock
  UBI: fix warnings when debugging is enabled