diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /Documentation/networking/dmfe.txt | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'Documentation/networking/dmfe.txt')
| -rw-r--r-- | Documentation/networking/dmfe.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/dmfe.txt b/Documentation/networking/dmfe.txt index b1b7499dd9d3..8006c227fda2 100644 --- a/Documentation/networking/dmfe.txt +++ b/Documentation/networking/dmfe.txt | |||
| @@ -60,6 +60,6 @@ Tobias Ringstrom <tori@unhappy.mine.nu> : Current Maintainer | |||
| 60 | Contributors: | 60 | Contributors: |
| 61 | 61 | ||
| 62 | Marcelo Tosatti <marcelo@conectiva.com.br> | 62 | Marcelo Tosatti <marcelo@conectiva.com.br> |
| 63 | Alan Cox <alan@redhat.com> | 63 | Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 64 | Jeff Garzik <jgarzik@pobox.com> | 64 | Jeff Garzik <jgarzik@pobox.com> |
| 65 | Vojtech Pavlik <vojtech@suse.cz> | 65 | Vojtech Pavlik <vojtech@suse.cz> |