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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
Documentation
/
networking
/
dmfe.txt
diff --git
a/Documentation/networking/dmfe.txt
b/Documentation/networking/dmfe.txt
index
b1b7499
..
8006c22
100644
(file)
--- a/
Documentation/networking/dmfe.txt
+++ b/
Documentation/networking/dmfe.txt
@@
-60,6
+60,6
@@
Tobias Ringstrom <tori@unhappy.mine.nu> : Current Maintainer
Contributors:
Marcelo Tosatti <marcelo@conectiva.com.br>
-Alan Cox <alan@
redhat.com
>
+Alan Cox <alan@
lxorguk.ukuu.org.uk
>
Jeff Garzik <jgarzik@pobox.com>
Vojtech Pavlik <vojtech@suse.cz>