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

diff --combined Documentation/DocBook/mtdnand.tmpl
index 999afe1ca8cbf33151e8504f753848c052b3539b,630159c5bdbae867cd15cf442c52feeb524d39aa..a8c8cce506332a2037833d8cc8f7dc54c0791748
--- 1/Documentation/DocBook/mtdnand.tmpl
--- 2/Documentation/DocBook/mtdnand.tmpl
+++ b/Documentation/DocBook/mtdnand.tmpl
@@@ -109,7 -109,7 +109,7 @@@
                for most of the implementations. These functions can be replaced by the
                board driver if neccecary. Those functions are called via pointers in the
                NAND chip description structure. The board driver can set the functions which
-               should be replaced by board dependend functions before calling nand_scan().
+               should be replaced by board dependent functions before calling nand_scan().
                If the function pointer is NULL on entry to nand_scan() then the pointer
                is set to the default function which is suitable for the detected chip type.
                </para></listitem>
@@@ -133,7 -133,7 +133,7 @@@
                [REPLACEABLE]</para><para>
                Replaceable members hold hardware related functions which can be 
                provided by the board driver. The board driver can set the functions which
-               should be replaced by board dependend functions before calling nand_scan().
+               should be replaced by board dependent functions before calling nand_scan().
                If the function pointer is NULL on entry to nand_scan() then the pointer
                is set to the default function which is suitable for the detected chip type.
                </para></listitem>
@@@ -156,9 -156,8 +156,8 @@@
        <title>Basic board driver</title>
        <para>
                For most boards it will be sufficient to provide just the
-               basic functions and fill out some really board dependend
+               basic functions and fill out some really board dependent
                members in the nand chip description structure.
-               See drivers/mtd/nand/skeleton for reference.
        </para>
        <sect1>
                <title>Basic defines</title>
@@@ -189,9 -188,9 +188,9 @@@ static unsigned long baseaddr
        <sect1>
                <title>Partition defines</title>
                <para>
 -                      If you want to divide your device into parititions, then
 -                      enable the configuration switch CONFIG_MTD_PARITIONS and define
 -                      a paritioning scheme suitable to your board.
 +                      If you want to divide your device into partitions, then
 +                      enable the configuration switch CONFIG_MTD_PARTITIONS and define
 +                      a partitioning scheme suitable to your board.
                </para>
                <programlisting>
  #define NUM_PARTITIONS 2
@@@ -1295,7 -1294,9 +1294,9 @@@ in this page</entry
       </para>
  !Idrivers/mtd/nand/nand_base.c
  !Idrivers/mtd/nand/nand_bbt.c
- !Idrivers/mtd/nand/nand_ecc.c
+ <!-- No internal functions for kernel-doc:
+ X!Idrivers/mtd/nand/nand_ecc.c
+ -->
    </chapter>
  
    <chapter id="credits">

diff --combined fs/jffs2/nodelist.h
index f752baa8d399a2feb1730a264630de22d93372a9,be6d4a4dd8e06c1bf575e605aa1a89b0db5e88f4..cae92c14116dc76de6e7ab53fc53a7ea4bc1606a
--- 1/fs/jffs2/nodelist.h
--- 2/fs/jffs2/nodelist.h
+++ b/fs/jffs2/nodelist.h
@@@ -14,6 -14,7 +14,6 @@@
  #ifndef __JFFS2_NODELIST_H__
  #define __JFFS2_NODELIST_H__
  
 -#include <linux/config.h>
  #include <linux/fs.h>
  #include <linux/types.h>
  #include <linux/jffs2.h>
@@@ -426,8 -427,6 +426,6 @@@ char *jffs2_getlink(struct jffs2_sb_inf
  /* scan.c */
  int jffs2_scan_medium(struct jffs2_sb_info *c);
  void jffs2_rotate_lists(struct jffs2_sb_info *c);
- int jffs2_fill_scan_buf(struct jffs2_sb_info *c, void *buf,
-                               uint32_t ofs, uint32_t len);
  struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uint32_t ino);
  int jffs2_scan_classify_jeb(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
  int jffs2_scan_dirty_space(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb, uint32_t size);