Skip to content

Commit 2f82af0

Browse files
npitretorvalds
authored andcommitted
Nicolas Pitre has a new email address
Due to problems at cam.org, my [email protected] email address is no longer valid. FRom now on, [email protected] should be used instead. Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f199fd9 commit 2f82af0

39 files changed

+45
-45
lines changed

CREDITS

+1-1
Original file line numberDiff line numberDiff line change
@@ -2800,7 +2800,7 @@ D: Starter of Linux1394 effort
28002800
S: ask per mail for current address
28012801

28022802
N: Nicolas Pitre
2803-
E: nico@cam.org
2803+
E: nico@fluxnic.net
28042804
D: StrongARM SA1100 support integrator & hacker
28052805
D: Xscale PXA architecture
28062806
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)

Documentation/arm/SA1100/ADSBitsy

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ Notes:
4040
mode, the timing is off so the image is corrupted. This will be
4141
fixed soon.
4242

43-
Any contribution can be sent to nico@cam.org and will be greatly welcome!
43+
Any contribution can be sent to nico@fluxnic.net and will be greatly welcome!

Documentation/arm/SA1100/Assabet

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Then, rebooting the Assabet is just a matter of waiting for the login prompt.
240240

241241

242242
Nicolas Pitre
243-
nico@cam.org
243+
nico@fluxnic.net
244244
June 12, 2001
245245

246246

Documentation/arm/SA1100/Brutus

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ little modifications.
6060

6161
Any contribution is welcome.
6262

63-
Please send patches to nico@cam.org
63+
Please send patches to nico@fluxnic.net
6464

6565
Have Fun !
6666

Documentation/arm/SA1100/GraphicsClient

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ For more details, contact Applied Data Systems or see
44
http://www.applieddata.net/products.html
55

66
The original Linux support for this product has been provided by
7-
Nicolas Pitre <nico@cam.org>. Continued development work by
7+
Nicolas Pitre <nico@fluxnic.net>. Continued development work by
88
Woojung Huh <[email protected]>
99

1010
It's currently possible to mount a root filesystem via NFS providing a
@@ -94,5 +94,5 @@ Notes:
9494
mode, the timing is off so the image is corrupted. This will be
9595
fixed soon.
9696

97-
Any contribution can be sent to nico@cam.org and will be greatly welcome!
97+
Any contribution can be sent to nico@fluxnic.net and will be greatly welcome!
9898

Documentation/arm/SA1100/GraphicsMaster

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ For more details, contact Applied Data Systems or see
44
http://www.applieddata.net/products.html
55

66
The original Linux support for this product has been provided by
7-
Nicolas Pitre <nico@cam.org>. Continued development work by
7+
Nicolas Pitre <nico@fluxnic.net>. Continued development work by
88
Woojung Huh <[email protected]>
99

1010
Use 'make graphicsmaster_config' before any 'make config'.
@@ -50,4 +50,4 @@ Notes:
5050
mode, the timing is off so the image is corrupted. This will be
5151
fixed soon.
5252

53-
Any contribution can be sent to nico@cam.org and will be greatly welcome!
53+
Any contribution can be sent to nico@fluxnic.net and will be greatly welcome!

Documentation/arm/SA1100/Victor

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Of course Victor is using Linux as its main operating system.
99
The Victor implementation for Linux is maintained by Nicolas Pitre:
1010

1111
12-
nico@cam.org
12+
nico@fluxnic.net
1313

1414
For any comments, please feel free to contact me through the above
1515
addresses.

MAINTAINERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -3317,7 +3317,7 @@ S: Supported
33173317
F: drivers/net/wireless/mwl8k.c
33183318

33193319
MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
3320-
M: Nicolas Pitre <nico@cam.org>
3320+
M: Nicolas Pitre <nico@fluxnic.net>
33213321
S: Maintained
33223322

33233323
MARVELL YUKON / SYSKONNECT DRIVER
@@ -4689,7 +4689,7 @@ F: include/linux/sl?b*.h
46894689
F: mm/sl?b.c
46904690

46914691
SMC91x ETHERNET DRIVER
4692-
M: Nicolas Pitre <nico@cam.org>
4692+
M: Nicolas Pitre <nico@fluxnic.net>
46934693
S: Maintained
46944694
F: drivers/net/smc91x.*
46954695

arch/arm/boot/compressed/head-sa1100.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* linux/arch/arm/boot/compressed/head-sa1100.S
33
*
4-
* Copyright (C) 1999 Nicolas Pitre <nico@cam.org>
4+
* Copyright (C) 1999 Nicolas Pitre <nico@fluxnic.net>
55
*
66
* SA1100 specific tweaks. This is merged into head.S by the linker.
77
*

arch/arm/lib/lib1funcs.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines
33
*
4-
* Author: Nicolas Pitre <nico@cam.org>
4+
* Author: Nicolas Pitre <nico@fluxnic.net>
55
* - contributed to gcc-3.4 on Sep 30, 2003
66
* - adapted for the Linux kernel on Oct 2, 2003
77
*/

arch/arm/lib/sha1.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* SHA transform optimized for ARM
55
*
6-
* Copyright: (C) 2005 by Nicolas Pitre <nico@cam.org>
6+
* Copyright: (C) 2005 by Nicolas Pitre <nico@fluxnic.net>
77
* Created: September 17, 2005
88
*
99
* This program is free software; you can redistribute it and/or modify

arch/arm/mach-sa1100/include/mach/assabet.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/mach-sa1100/include/mach/assabet.h
33
*
4-
* Created 2000/06/05 by Nicolas Pitre <nico@cam.org>
4+
* Created 2000/06/05 by Nicolas Pitre <nico@fluxnic.net>
55
*
66
* This file contains the hardware specific definitions for Assabet
77
* Only include this file from SA1100-specific files.

arch/arm/mach-sa1100/include/mach/hardware.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/mach-sa1100/include/mach/hardware.h
33
*
4-
* Copyright (C) 1998 Nicolas Pitre <nico@cam.org>
4+
* Copyright (C) 1998 Nicolas Pitre <nico@fluxnic.net>
55
*
66
* This file contains the hardware definitions for SA1100 architecture
77
*

arch/arm/mach-sa1100/include/mach/memory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/mach-sa1100/include/mach/memory.h
33
*
4-
* Copyright (C) 1999-2000 Nicolas Pitre <nico@cam.org>
4+
* Copyright (C) 1999-2000 Nicolas Pitre <nico@fluxnic.net>
55
*/
66

77
#ifndef __ASM_ARCH_MEMORY_H

arch/arm/mach-sa1100/include/mach/neponset.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/mach-sa1100/include/mach/neponset.h
33
*
4-
* Created 2000/06/05 by Nicolas Pitre <nico@cam.org>
4+
* Created 2000/06/05 by Nicolas Pitre <nico@fluxnic.net>
55
*
66
* This file contains the hardware specific definitions for Assabet
77
* Only include this file from SA1100-specific files.

arch/arm/mach-sa1100/include/mach/system.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/mach-sa1100/include/mach/system.h
33
*
4-
* Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
4+
* Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
55
*/
66
#include <mach/hardware.h>
77

arch/arm/mach-sa1100/include/mach/uncompress.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/mach-sa1100/include/mach/uncompress.h
33
*
4-
* (C) 1999 Nicolas Pitre <nico@cam.org>
4+
* (C) 1999 Nicolas Pitre <nico@fluxnic.net>
55
*
66
* Reorganised to be machine independent.
77
*/

arch/arm/mach-sa1100/pm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Save more value for the resume function! Support
1616
* Bitsy/Assabet/Freebird board
1717
*
18-
* 2001-08-29: Nicolas Pitre <nico@cam.org>
18+
* 2001-08-29: Nicolas Pitre <nico@fluxnic.net>
1919
* Cleaned up, pushed platform dependent stuff
2020
* in the platform specific files.
2121
*

arch/arm/mach-sa1100/time.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright (C) 1998 Deborah Wallach.
55
* Twiddles (C) 1999 Hugo Fiennes <[email protected]>
66
*
7-
* 2000/03/29 (C) Nicolas Pitre <nico@cam.org>
7+
* 2000/03/29 (C) Nicolas Pitre <nico@fluxnic.net>
88
* Rewritten: big cleanup, much simpler, better HZ accuracy.
99
*
1010
*/

arch/arm/mm/proc-xscale.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* 2001 Sep 08:
1919
* Completely revisited, many important fixes
20-
* Nicolas Pitre <nico@cam.org>
20+
* Nicolas Pitre <nico@fluxnic.net>
2121
*/
2222

2323
#include <linux/linkage.h>

arch/arm/plat-iop/setup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* arch/arm/plat-iop/setup.c
33
*
4-
* Author: Nicolas Pitre <nico@cam.org>
4+
* Author: Nicolas Pitre <nico@fluxnic.net>
55
* Copyright (C) 2001 MontaVista Software, Inc.
66
* Copyright (C) 2004 Intel Corporation.
77
*

arch/arm/plat-omap/include/mach/system.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copied from arch/arm/mach-sa1100/include/mach/system.h
3-
* Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
3+
* Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
44
*/
55
#ifndef __ASM_ARCH_SYSTEM_H
66
#define __ASM_ARCH_SYSTEM_H

drivers/input/keyboard/pxa27x_keypad.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Based on a previous implementations by Kevin O'Connor
1010
* <kevin_at_koconnor.net> and Alex Osborne <[email protected]> and
11-
* on some suggestions by Nicolas Pitre <nico@cam.org>.
11+
* on some suggestions by Nicolas Pitre <nico@fluxnic.net>.
1212
*
1313
* This program is free software; you can redistribute it and/or modify
1414
* it under the terms of the GNU General Public License version 2 as

drivers/mtd/chips/cfi_cmdset_0001.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* (C) 2000 Red Hat. GPL'd
66
*
77
*
8-
* 10/10/2000 Nicolas Pitre <nico@cam.org>
8+
* 10/10/2000 Nicolas Pitre <nico@fluxnic.net>
99
* - completely revamped method functions so they are aware and
1010
* independent of the flash geometry (buswidth, interleave, etc.)
1111
* - scalability vs code size is completely set at compile-time

drivers/mtd/chips/cfi_cmdset_0020.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* (C) 2000 Red Hat. GPL'd
66
*
7-
* 10/10/2000 Nicolas Pitre <nico@cam.org>
7+
* 10/10/2000 Nicolas Pitre <nico@fluxnic.net>
88
* - completely revamped method functions so they are aware and
99
* independent of the flash geometry (buswidth, interleave, etc.)
1010
* - scalability vs code size is completely set at compile-time

drivers/mtd/maps/bfin-async-flash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* for example. All board-specific configuration goes in your
77
* board resources file.
88
*
9-
* Copyright 2000 Nicolas Pitre <nico@cam.org>
9+
* Copyright 2000 Nicolas Pitre <nico@fluxnic.net>
1010
* Copyright 2005-2008 Analog Devices Inc.
1111
*
1212
* Enter bugs at http://blackfin.uclinux.org/

drivers/mtd/maps/ceiva.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Based on: sa1100-flash.c, which has the following copyright:
1010
* Flash memory access on SA11x0 based devices
1111
*
12-
* (C) 2000 Nicolas Pitre <nico@cam.org>
12+
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
1313
*
1414
*/
1515

drivers/mtd/maps/dc21285.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MTD map driver for flash on the DC21285 (the StrongARM-110 companion chip)
33
*
4-
* (C) 2000 Nicolas Pitre <nico@cam.org>
4+
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
55
*
66
* This code is GPL
77
*/
@@ -249,5 +249,5 @@ module_exit(cleanup_dc21285);
249249

250250

251251
MODULE_LICENSE("GPL");
252-
MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");
252+
MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net>");
253253
MODULE_DESCRIPTION("MTD map driver for DC21285 boards");

drivers/mtd/maps/ipaq-flash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based)
33
*
4-
* (C) 2000 Nicolas Pitre <nico@cam.org>
4+
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
55
* (C) 2002 Hewlett-Packard Company <[email protected]>
66
* (C) 2003 Christian Pellegrin <[email protected]>, <[email protected]>: concatenation of multiple flashes
77
*/

drivers/mtd/maps/pxa2xx-flash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,5 +175,5 @@ module_init(init_pxa2xx_flash);
175175
module_exit(cleanup_pxa2xx_flash);
176176

177177
MODULE_LICENSE("GPL");
178-
MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");
178+
MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net>");
179179
MODULE_DESCRIPTION("MTD map driver for Intel XScale PXA2xx");

drivers/mtd/maps/sa1100-flash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Flash memory access on SA11x0 based devices
33
*
4-
* (C) 2000 Nicolas Pitre <nico@cam.org>
4+
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
55
*/
66
#include <linux/module.h>
77
#include <linux/types.h>

drivers/mtd/mtdblock.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Direct MTD block device access
33
*
4-
* (C) 2000-2003 Nicolas Pitre <nico@cam.org>
4+
* (C) 2000-2003 Nicolas Pitre <nico@fluxnic.net>
55
* (C) 1999-2003 David Woodhouse <[email protected]>
66
*/
77

@@ -403,5 +403,5 @@ module_exit(cleanup_mtdblock);
403403

404404

405405
MODULE_LICENSE("GPL");
406-
MODULE_AUTHOR("Nicolas Pitre <nico@cam.org> et al.");
406+
MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net> et al.");
407407
MODULE_DESCRIPTION("Caching read/erase/writeback block device emulation access to MTD devices");

drivers/mtd/mtdpart.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Simple MTD partitioning layer
33
*
4-
* (C) 2000 Nicolas Pitre <nico@cam.org>
4+
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
55
*
66
* This code is GPL
77
*

drivers/net/smc91x.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* contributors:
3737
* Daris A Nevil <[email protected]>
38-
* Nicolas Pitre <nico@cam.org>
38+
* Nicolas Pitre <nico@fluxnic.net>
3939
* Russell King <[email protected]>
4040
*
4141
* History:
@@ -58,7 +58,7 @@
5858
* 22/09/04 Nicolas Pitre big update (see commit log for details)
5959
*/
6060
static const char version[] =
61-
"smc91x.c: v1.1, sep 22 2004 by Nicolas Pitre <nico@cam.org>\n";
61+
"smc91x.c: v1.1, sep 22 2004 by Nicolas Pitre <nico@fluxnic.net>\n";
6262

6363
/* Debugging level */
6464
#ifndef SMC_DEBUG

drivers/net/smc91x.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
. Authors
2929
. Erik Stahlman <[email protected]>
3030
. Daris A Nevil <[email protected]>
31-
. Nicolas Pitre <nico@cam.org>
31+
. Nicolas Pitre <nico@fluxnic.net>
3232
.
3333
---------------------------------------------------------------------------*/
3434
#ifndef _SMC91X_H_

drivers/rtc/rtc-sa1100.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
* Modifications from:
1111
12-
* Nicolas Pitre <nico@cam.org>
12+
* Nicolas Pitre <nico@fluxnic.net>
1313
* Andrew Christian <[email protected]>
1414
*
1515
* Converted to the RTC subsystem and Driver Model

drivers/video/sa1100fb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
* - FrameBuffer memory is now allocated at run-time when the
6767
* driver is initialized.
6868
*
69-
* 2000/04/10: Nicolas Pitre <nico@cam.org>
69+
* 2000/04/10: Nicolas Pitre <nico@fluxnic.net>
7070
* - Big cleanup for dynamic selection of machine type at run time.
7171
*
7272
* 2000/07/19: Jamey Hicks <[email protected]>

include/linux/mtd/partitions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* MTD partitioning layer definitions
33
*
4-
* (C) 2000 Nicolas Pitre <nico@cam.org>
4+
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
55
*
66
* This code is GPL
77
*/

lib/inflate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Adapted for booting Linux by Hannu Savolainen 1993
88
* based on gzip-1.0.3
99
*
10-
* Nicolas Pitre <nico@cam.org>, 1999/04/14 :
10+
* Nicolas Pitre <nico@fluxnic.net>, 1999/04/14 :
1111
* Little mods for all variable to reside either into rodata or bss segments
1212
* by marking constant variables with 'const' and initializing all the others
1313
* at run-time only. This allows for the kernel uncompressor to run

0 commit comments

Comments
 (0)