diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-28 00:34:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-28 00:34:57 +0200 |
| commit | f00546363fff1576ceddc2690d47e5f9c1dd2e05 (patch) | |
| tree | f6cb8965b6754fc6ce7570cf1471ebe9874e509a /fs/jffs2/acl.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init() (diff) | |
| download | linux-f00546363fff1576ceddc2690d47e5f9c1dd2e05.tar.xz linux-f00546363fff1576ceddc2690d47e5f9c1dd2e05.zip | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (46 commits)
[MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init()
[MTD] [NAND] CM-x270 MTD driver
[MTD] [NAND] Wrong calculation of page number in nand_block_bad()
[MTD] [MAPS] fix plat-ram printk format
[JFFS2] Fix compr_rubin.c build after include file elimination.
[JFFS2] Handle inodes with only a single metadata node with non-zero isize
[JFFS2] Tidy up licensing/copyright boilerplate.
[MTD] [OneNAND] Exit loop only when column start with 0
[MTD] [OneNAND] Fix access the past of the real oobfree array
[MTD] [OneNAND] Update Samsung OneNAND official URL
[JFFS2] Better fix for all-zero node headers
[JFFS2] Improve read_inode memory usage, v2.
[JFFS2] Improve failure mode if inode checking leaves unchecked space.
[JFFS2] Fix cross-endian build.
[MTD] Finish conversion mtd_blkdevs to use the kthread API
[JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
Use menuconfig objects: MTD
[MTD] mtd_blkdevs: Convert to use the kthread API
[MTD] Fix fwh_lock locking
[JFFS2] Speed up mount for directly-mapped NOR flash
...
Diffstat (limited to 'fs/jffs2/acl.h')
| -rw-r--r-- | fs/jffs2/acl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jffs2/acl.h b/fs/jffs2/acl.h index fa327dbd3171..c84378cee82a 100644 --- a/fs/jffs2/acl.h +++ b/fs/jffs2/acl.h @@ -1,13 +1,14 @@ /* * JFFS2 -- Journalling Flash File System, Version 2. * - * Copyright (C) 2006 NEC Corporation + * Copyright © 2006 NEC Corporation * * Created by KaiGai Kohei <kaigai@ak.jp.nec.com> * * For licensing information, see the file 'LICENCE' in this directory. * */ + struct jffs2_acl_entry { jint16_t e_tag; jint16_t e_perm; |