git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradea...
[pandora-kernel.git]
/
drivers
/
w1
/
w1.c
diff --git
a/drivers/w1/w1.c
b/drivers/w1/w1.c
index
6c136c1
..
c374978
100644
(file)
--- a/
drivers/w1/w1.c
+++ b/
drivers/w1/w1.c
@@
-1,7
+1,7
@@
/*
* w1.c
*
/*
* w1.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
*
*
* This program is free software; you can redistribute it and/or modify
@@
-42,7
+42,7
@@
#include "w1_netlink.h"
MODULE_LICENSE("GPL");
#include "w1_netlink.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.");
static int w1_timeout = 10;
MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol.");
static int w1_timeout = 10;