From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 6 Mar 2008 02:00:22 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6
X-Git-Tag: v2.6.25-rc5~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7fe321eeba58f0a37cc4324d10e52092be457e0;p=linux-2.6

Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6

* 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6:
  UBI: mtd/ubi/vtbl.c: fix memory leak
  UBI: fix sparse errors in ubi.h
  UBI: fix error message
  UBI: silence warning
---

d7fe321eeba58f0a37cc4324d10e52092be457e0