diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-30 04:38:01 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-30 04:38:01 +0200 |
commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /fs/jffs2/xattr_trusted.c | |
parent | [POWERPC] remove kernel module option for booke wdt (diff) | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | linux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.tar.xz linux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.zip |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'fs/jffs2/xattr_trusted.c')
-rw-r--r-- | fs/jffs2/xattr_trusted.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c index ed046e19dbfa..8ec5765ef348 100644 --- a/fs/jffs2/xattr_trusted.c +++ b/fs/jffs2/xattr_trusted.c @@ -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. * */ + #include <linux/kernel.h> #include <linux/fs.h> #include <linux/jffs2.h> |