diff options
author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /drivers/w1/w1_netlink.h | |
parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
download | linux-rt-ceb1c532ba6220900e61ec7073a9234661efa450.tar.gz |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'drivers/w1/w1_netlink.h')
-rw-r--r-- | drivers/w1/w1_netlink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h index 27e950f935b1..b0922dc29658 100644 --- a/drivers/w1/w1_netlink.h +++ b/drivers/w1/w1_netlink.h @@ -1,7 +1,7 @@ /* * w1_netlink.h * - * Copyright (c) 2003 Evgeniy Polyakov <johnpol@2ka.mipt.ru> + * Copyright (c) 2003 Evgeniy Polyakov <zbr@ioremap.net> * * * This program is free software; you can redistribute it and/or modify |