Skip to content

Commit

Permalink
Nicolas Pitre has a new email address
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
npitre authored and torvalds committed Sep 15, 2009
1 parent f199fd9 commit 2f82af0
Show file tree
Hide file tree
Showing 39 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -2800,7 +2800,7 @@ D: Starter of Linux1394 effort
S: ask per mail for current address

N: Nicolas Pitre
E: nico@cam.org
E: nico@fluxnic.net
D: StrongARM SA1100 support integrator & hacker
D: Xscale PXA architecture
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/ADSBitsy
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ Notes:
mode, the timing is off so the image is corrupted. This will be
fixed soon.

Any contribution can be sent to nico@cam.org and will be greatly welcome!
Any contribution can be sent to nico@fluxnic.net and will be greatly welcome!
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/Assabet
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ Then, rebooting the Assabet is just a matter of waiting for the login prompt.


Nicolas Pitre
nico@cam.org
nico@fluxnic.net
June 12, 2001


Expand Down
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/Brutus
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ little modifications.

Any contribution is welcome.

Please send patches to nico@cam.org
Please send patches to nico@fluxnic.net

Have Fun !

4 changes: 2 additions & 2 deletions Documentation/arm/SA1100/GraphicsClient
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ For more details, contact Applied Data Systems or see
http://www.applieddata.net/products.html

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

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

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

4 changes: 2 additions & 2 deletions Documentation/arm/SA1100/GraphicsMaster
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ For more details, contact Applied Data Systems or see
http://www.applieddata.net/products.html

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

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

Any contribution can be sent to nico@cam.org and will be greatly welcome!
Any contribution can be sent to nico@fluxnic.net and will be greatly welcome!
2 changes: 1 addition & 1 deletion Documentation/arm/SA1100/Victor
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Of course Victor is using Linux as its main operating system.
The Victor implementation for Linux is maintained by Nicolas Pitre:

[email protected]
nico@cam.org
nico@fluxnic.net

For any comments, please feel free to contact me through the above
addresses.
Expand Down
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3317,7 +3317,7 @@ S: Supported
F: drivers/net/wireless/mwl8k.c

MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
M: Nicolas Pitre <nico@cam.org>
M: Nicolas Pitre <nico@fluxnic.net>
S: Maintained

MARVELL YUKON / SYSKONNECT DRIVER
Expand Down Expand Up @@ -4689,7 +4689,7 @@ F: include/linux/sl?b*.h
F: mm/sl?b.c

SMC91x ETHERNET DRIVER
M: Nicolas Pitre <nico@cam.org>
M: Nicolas Pitre <nico@fluxnic.net>
S: Maintained
F: drivers/net/smc91x.*

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/compressed/head-sa1100.S
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* linux/arch/arm/boot/compressed/head-sa1100.S
*
* Copyright (C) 1999 Nicolas Pitre <nico@cam.org>
* Copyright (C) 1999 Nicolas Pitre <nico@fluxnic.net>
*
* SA1100 specific tweaks. This is merged into head.S by the linker.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/lib/lib1funcs.S
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines
*
* Author: Nicolas Pitre <nico@cam.org>
* Author: Nicolas Pitre <nico@fluxnic.net>
* - contributed to gcc-3.4 on Sep 30, 2003
* - adapted for the Linux kernel on Oct 2, 2003
*/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/lib/sha1.S
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* SHA transform optimized for ARM
*
* Copyright: (C) 2005 by Nicolas Pitre <nico@cam.org>
* Copyright: (C) 2005 by Nicolas Pitre <nico@fluxnic.net>
* Created: September 17, 2005
*
* This program is free software; you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/assabet.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/assabet.h
*
* Created 2000/06/05 by Nicolas Pitre <nico@cam.org>
* Created 2000/06/05 by Nicolas Pitre <nico@fluxnic.net>
*
* This file contains the hardware specific definitions for Assabet
* Only include this file from SA1100-specific files.
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/hardware.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/hardware.h
*
* Copyright (C) 1998 Nicolas Pitre <nico@cam.org>
* Copyright (C) 1998 Nicolas Pitre <nico@fluxnic.net>
*
* This file contains the hardware definitions for SA1100 architecture
*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/memory.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/memory.h
*
* Copyright (C) 1999-2000 Nicolas Pitre <nico@cam.org>
* Copyright (C) 1999-2000 Nicolas Pitre <nico@fluxnic.net>
*/

#ifndef __ASM_ARCH_MEMORY_H
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/neponset.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/neponset.h
*
* Created 2000/06/05 by Nicolas Pitre <nico@cam.org>
* Created 2000/06/05 by Nicolas Pitre <nico@fluxnic.net>
*
* This file contains the hardware specific definitions for Assabet
* Only include this file from SA1100-specific files.
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/system.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/system.h
*
* Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
* Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
*/
#include <mach/hardware.h>

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/include/mach/uncompress.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-sa1100/include/mach/uncompress.h
*
* (C) 1999 Nicolas Pitre <nico@cam.org>
* (C) 1999 Nicolas Pitre <nico@fluxnic.net>
*
* Reorganised to be machine independent.
*/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Save more value for the resume function! Support
* Bitsy/Assabet/Freebird board
*
* 2001-08-29: Nicolas Pitre <nico@cam.org>
* 2001-08-29: Nicolas Pitre <nico@fluxnic.net>
* Cleaned up, pushed platform dependent stuff
* in the platform specific files.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-sa1100/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 1998 Deborah Wallach.
* Twiddles (C) 1999 Hugo Fiennes <[email protected]>
*
* 2000/03/29 (C) Nicolas Pitre <nico@cam.org>
* 2000/03/29 (C) Nicolas Pitre <nico@fluxnic.net>
* Rewritten: big cleanup, much simpler, better HZ accuracy.
*
*/
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/proc-xscale.S
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* 2001 Sep 08:
* Completely revisited, many important fixes
* Nicolas Pitre <nico@cam.org>
* Nicolas Pitre <nico@fluxnic.net>
*/

#include <linux/linkage.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-iop/setup.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* arch/arm/plat-iop/setup.c
*
* Author: Nicolas Pitre <nico@cam.org>
* Author: Nicolas Pitre <nico@fluxnic.net>
* Copyright (C) 2001 MontaVista Software, Inc.
* Copyright (C) 2004 Intel Corporation.
*
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-omap/include/mach/system.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copied from arch/arm/mach-sa1100/include/mach/system.h
* Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
* Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
*/
#ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/pxa27x_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Based on a previous implementations by Kevin O'Connor
* <kevin_at_koconnor.net> and Alex Osborne <[email protected]> and
* on some suggestions by Nicolas Pitre <nico@cam.org>.
* on some suggestions by Nicolas Pitre <nico@fluxnic.net>.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/chips/cfi_cmdset_0001.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* (C) 2000 Red Hat. GPL'd
*
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
* 10/10/2000 Nicolas Pitre <nico@fluxnic.net>
* - completely revamped method functions so they are aware and
* independent of the flash geometry (buswidth, interleave, etc.)
* - scalability vs code size is completely set at compile-time
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/chips/cfi_cmdset_0020.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* (C) 2000 Red Hat. GPL'd
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
* 10/10/2000 Nicolas Pitre <nico@fluxnic.net>
* - completely revamped method functions so they are aware and
* independent of the flash geometry (buswidth, interleave, etc.)
* - scalability vs code size is completely set at compile-time
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/bfin-async-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* for example. All board-specific configuration goes in your
* board resources file.
*
* Copyright 2000 Nicolas Pitre <nico@cam.org>
* Copyright 2000 Nicolas Pitre <nico@fluxnic.net>
* Copyright 2005-2008 Analog Devices Inc.
*
* Enter bugs at http://blackfin.uclinux.org/
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/ceiva.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Based on: sa1100-flash.c, which has the following copyright:
* Flash memory access on SA11x0 based devices
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
*
*/

Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/maps/dc21285.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MTD map driver for flash on the DC21285 (the StrongARM-110 companion chip)
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
*
* This code is GPL
*/
Expand Down Expand Up @@ -249,5 +249,5 @@ module_exit(cleanup_dc21285);


MODULE_LICENSE("GPL");
MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");
MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net>");
MODULE_DESCRIPTION("MTD map driver for DC21285 boards");
2 changes: 1 addition & 1 deletion drivers/mtd/maps/ipaq-flash.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Flash memory access on iPAQ Handhelds (either SA1100 or PXA250 based)
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
* (C) 2002 Hewlett-Packard Company <[email protected]>
* (C) 2003 Christian Pellegrin <[email protected]>, <[email protected]>: concatenation of multiple flashes
*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/maps/pxa2xx-flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,5 +175,5 @@ module_init(init_pxa2xx_flash);
module_exit(cleanup_pxa2xx_flash);

MODULE_LICENSE("GPL");
MODULE_AUTHOR("Nicolas Pitre <nico@cam.org>");
MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net>");
MODULE_DESCRIPTION("MTD map driver for Intel XScale PXA2xx");
2 changes: 1 addition & 1 deletion drivers/mtd/maps/sa1100-flash.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Flash memory access on SA11x0 based devices
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
*/
#include <linux/module.h>
#include <linux/types.h>
Expand Down
4 changes: 2 additions & 2 deletions drivers/mtd/mtdblock.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Direct MTD block device access
*
* (C) 2000-2003 Nicolas Pitre <nico@cam.org>
* (C) 2000-2003 Nicolas Pitre <nico@fluxnic.net>
* (C) 1999-2003 David Woodhouse <[email protected]>
*/

Expand Down Expand Up @@ -403,5 +403,5 @@ module_exit(cleanup_mtdblock);


MODULE_LICENSE("GPL");
MODULE_AUTHOR("Nicolas Pitre <nico@cam.org> et al.");
MODULE_AUTHOR("Nicolas Pitre <nico@fluxnic.net> et al.");
MODULE_DESCRIPTION("Caching read/erase/writeback block device emulation access to MTD devices");
2 changes: 1 addition & 1 deletion drivers/mtd/mtdpart.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Simple MTD partitioning layer
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
*
* This code is GPL
*
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/smc91x.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*
* contributors:
* Daris A Nevil <[email protected]>
* Nicolas Pitre <nico@cam.org>
* Nicolas Pitre <nico@fluxnic.net>
* Russell King <[email protected]>
*
* History:
Expand All @@ -58,7 +58,7 @@
* 22/09/04 Nicolas Pitre big update (see commit log for details)
*/
static const char version[] =
"smc91x.c: v1.1, sep 22 2004 by Nicolas Pitre <nico@cam.org>\n";
"smc91x.c: v1.1, sep 22 2004 by Nicolas Pitre <nico@fluxnic.net>\n";

/* Debugging level */
#ifndef SMC_DEBUG
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/smc91x.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
. Authors
. Erik Stahlman <[email protected]>
. Daris A Nevil <[email protected]>
. Nicolas Pitre <nico@cam.org>
. Nicolas Pitre <nico@fluxnic.net>
.
---------------------------------------------------------------------------*/
#ifndef _SMC91X_H_
Expand Down
2 changes: 1 addition & 1 deletion drivers/rtc/rtc-sa1100.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Modifications from:
* CIH <[email protected]>
* Nicolas Pitre <nico@cam.org>
* Nicolas Pitre <nico@fluxnic.net>
* Andrew Christian <[email protected]>
*
* Converted to the RTC subsystem and Driver Model
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/sa1100fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* - FrameBuffer memory is now allocated at run-time when the
* driver is initialized.
*
* 2000/04/10: Nicolas Pitre <nico@cam.org>
* 2000/04/10: Nicolas Pitre <nico@fluxnic.net>
* - Big cleanup for dynamic selection of machine type at run time.
*
* 2000/07/19: Jamey Hicks <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion include/linux/mtd/partitions.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MTD partitioning layer definitions
*
* (C) 2000 Nicolas Pitre <nico@cam.org>
* (C) 2000 Nicolas Pitre <nico@fluxnic.net>
*
* This code is GPL
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/inflate.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Adapted for booting Linux by Hannu Savolainen 1993
* based on gzip-1.0.3
*
* Nicolas Pitre <nico@cam.org>, 1999/04/14 :
* Nicolas Pitre <nico@fluxnic.net>, 1999/04/14 :
* Little mods for all variable to reside either into rodata or bss segments
* by marking constant variables with 'const' and initializing all the others
* at run-time only. This allows for the kernel uncompressor to run
Expand Down

0 comments on commit 2f82af0

Please sign in to comment.