summaryrefslogtreecommitdiff
path: root/fs/jffs2/compr_lzo.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-08-16 21:09:34 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-08-16 21:09:34 (GMT)
commit300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch)
tree7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /fs/jffs2/compr_lzo.c
parent0a492896ac07336c98f37ad7fab4a6387b6ada78 (diff)
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff)
downloadlinux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/jffs2/compr_lzo.c')
-rw-r--r--fs/jffs2/compr_lzo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c
index cd02aca..ed25ae7c 100644
--- a/fs/jffs2/compr_lzo.c
+++ b/fs/jffs2/compr_lzo.c
@@ -2,6 +2,7 @@
* JFFS2 -- Journalling Flash File System, Version 2.
*
* Copyright © 2007 Nokia Corporation. All rights reserved.
+ * Copyright © 2004-2010 David Woodhouse <dwmw2@infradead.org>
*
* Created by Richard Purdie <rpurdie@openedhand.com>
*