]> err.no Git - linux-2.6/commitdiff
Merge git://git.infradead.org/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:29:08 +0000 (21:29 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:29:08 +0000 (21:29 -0700)
* 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

1  2 
Documentation/DocBook/mtdnand.tmpl
fs/jffs2/nodelist.h

Simple merge
Simple merge