From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jan 2009 23:57:26 +0000 (-0800)
Subject: Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
X-Git-Tag: v2.6.29-rc1~534
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=574c3fdae3890e60f8bc59e8107686944ba1e446;p=linux-2.6-omap-h63xx.git

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
---

574c3fdae3890e60f8bc59e8107686944ba1e446