diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 11:49:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 11:49:21 -0700 |
| commit | e8a89cebdbaab14caaa26debdb4ffd493b8831af (patch) | |
| tree | e0843f082628408ce259c72db36da54dff603987 /include/linux/jffs2.h | |
| parent | 8196867c74890ccdf40a2b5e3e173597fbc4f9ac (diff) | |
| parent | 6ae0185fe201eae0548dace2a84acb5050fc8606 (diff) | |
| download | blackbird-obmc-linux-e8a89cebdbaab14caaa26debdb4ffd493b8831af.tar.gz blackbird-obmc-linux-e8a89cebdbaab14caaa26debdb4ffd493b8831af.zip | |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (79 commits)
mtd: Remove obsolete <mtd/compatmac.h> include
mtd: Update copyright notices
jffs2: Update copyright notices
mtd-physmap: add support users can assign the probe type in board files
mtd: remove redwood map driver
mxc_nand: Add v3 (i.MX51) Support
mxc_nand: support 8bit ecc
mxc_nand: fix correct_data function
mxc_nand: add V1_V2 namespace to registers
mxc_nand: factor out a check_int function
mxc_nand: make some internally used functions overwriteable
mxc_nand: rework get_dev_status
mxc_nand: remove 0xe00 offset from registers
mtd: denali: Add multi connected NAND support
mtd: denali: Remove set_ecc_config function
mtd: denali: Remove unuseful code in get_xx_nand_para functions
mtd: denali: Remove device_info_tag structure
mtd: m25p80: add support for the Winbond W25Q32 SPI flash chip
mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips
mtd: m25p80: add support for the EON EN25P{32, 64} SPI flash chips
...
Fix up trivial conflicts in drivers/mtd/maps/{Kconfig,redwood.c} due to
redwood driver removal.
Diffstat (limited to 'include/linux/jffs2.h')
| -rw-r--r-- | include/linux/jffs2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h index edb9231f1898..a18b719f49d4 100644 --- a/include/linux/jffs2.h +++ b/include/linux/jffs2.h @@ -1,7 +1,8 @@ /* * JFFS2 -- Journalling Flash File System, Version 2. * - * Copyright (C) 2001-2003 Red Hat, Inc. + * Copyright © 2001-2007 Red Hat, Inc. + * Copyright © 2004-2010 David Woodhouse <dwmw2@infradead.org> * * Created by David Woodhouse <dwmw2@infradead.org> * |
