diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
| commit | 2d0b579a9831c927bcebf5f61055e7462f0af2dc (patch) | |
| tree | 3181c183b463e745601b1f4efda0f8fff3f1c08b /drivers/w1/masters/ds2490.c | |
| parent | e80ca144ea902efa7aed446780fd9fad421fd8d3 (diff) | |
| parent | 671ee7f0ce62e4b991b47fcf1c161c3f710dabbc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-fixes-for-linus
Diffstat (limited to 'drivers/w1/masters/ds2490.c')
| -rw-r--r-- | drivers/w1/masters/ds2490.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 02bf7bf7160b..b5abaae38e97 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * dscore.c | 2 | * dscore.c |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 4 | * Copyright (c) 2004 Evgeniy Polyakov <zbr@ioremap.net> |
| 5 | * | 5 | * |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -1024,5 +1024,5 @@ module_init(ds_init); | |||
| 1024 | module_exit(ds_fini); | 1024 | module_exit(ds_fini); |
| 1025 | 1025 | ||
| 1026 | MODULE_LICENSE("GPL"); | 1026 | MODULE_LICENSE("GPL"); |
| 1027 | MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); | 1027 | MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>"); |
| 1028 | MODULE_DESCRIPTION("DS2490 USB <-> W1 bus master driver (DS9490*)"); | 1028 | MODULE_DESCRIPTION("DS2490 USB <-> W1 bus master driver (DS9490*)"); |