diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-16 01:06:11 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-16 01:06:11 +0200 |
| commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
| tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /drivers/w1/slaves/w1_smem.c | |
| parent | ARM: OMAP: Introduce SoC specific early_init (diff) | |
| parent | OMAP: id: remove OMAP_CHIP declarations, code (diff) | |
| download | linux-ceb1c532ba6220900e61ec7073a9234661efa450.tar.xz linux-ceb1c532ba6220900e61ec7073a9234661efa450.zip | |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'drivers/w1/slaves/w1_smem.c')
| -rw-r--r-- | drivers/w1/slaves/w1_smem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_smem.c b/drivers/w1/slaves/w1_smem.c index cc8c02e92593..84655625c870 100644 --- a/drivers/w1/slaves/w1_smem.c +++ b/drivers/w1/slaves/w1_smem.c @@ -1,7 +1,7 @@ /* * w1_smem.c * - * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> + * Copyright (c) 2004 Evgeniy Polyakov <zbr@ioremap.net> * * * This program is free software; you can redistribute it and/or modify @@ -32,7 +32,7 @@ #include "../w1_family.h" MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); +MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>"); MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol, 64bit memory family."); static struct w1_family w1_smem_family_01 = { |