From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 4 Jul 2006 04:29:08 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.18-rc1~20
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0d1782144e81faf6203075c5fcd0a2f0db91af5b;p=linux-2.6-omap-h63xx.git

Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  [JFFS2][XATTR] Fix memory leak in POSIX-ACL support
  fs/jffs2/: make 2 functions static
  [MTD] NAND: Fix broken sharpsl driver
  [JFFS2][XATTR] Fix xd->refcnt race condition
  MTD: kernel-doc fixes + additions
  MTD: fix all kernel-doc warnings
  [MTD] DOC: Fixup read functions and do a little cleanup
---

0d1782144e81faf6203075c5fcd0a2f0db91af5b