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

diff --cc fs/jffs2/file.c
Simple merge

diff --cc fs/jffs2/nodelist.c
Simple merge

diff --cc fs/jffs2/scan.c
Simple merge

diff --cc fs/jffs2/summary.c
Simple merge

diff --cc fs/jffs2/super.c
Simple merge

diff --cc include/linux/jffs2.h
index 2cac60e,a26fbd4..c48f521
--- 1/include/linux/jffs2.h
--- 2/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@@ -161,34 -149,8 +161,34 @@@ struct jffs2_raw_inod
        jint32_t data_crc;   /* CRC for the (compressed) data.  */
        jint32_t node_crc;   /* CRC for the raw inode (excluding data)  */
        uint8_t data[0];
- } __attribute__((packed));
+ };
  
 +struct jffs2_raw_xattr {
 +      jint16_t magic;
 +      jint16_t nodetype;      /* = JFFS2_NODETYPE_XATTR */
 +      jint32_t totlen;
 +      jint32_t hdr_crc;
 +      jint32_t xid;           /* XATTR identifier number */
 +      jint32_t version;
 +      uint8_t xprefix;
 +      uint8_t name_len;
 +      jint16_t value_len;
 +      jint32_t data_crc;
 +      jint32_t node_crc;
 +      uint8_t data[0];
 +} __attribute__((packed));
 +
 +struct jffs2_raw_xref
 +{
 +      jint16_t magic;
 +      jint16_t nodetype;      /* = JFFS2_NODETYPE_XREF */
 +      jint32_t totlen;
 +      jint32_t hdr_crc;
 +      jint32_t ino;           /* inode number */
 +      jint32_t xid;           /* XATTR identifier number */
 +      jint32_t node_crc;
 +} __attribute__((packed));
 +
  struct jffs2_raw_summary
  {
        jint16_t magic;