diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /Documentation/networking | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/.gitignore | 1 | ||||
| -rw-r--r-- | Documentation/networking/dmfe.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/networking/.gitignore b/Documentation/networking/.gitignore new file mode 100644 index 000000000000..286a5680f490 --- /dev/null +++ b/Documentation/networking/.gitignore | |||
| @@ -0,0 +1 @@ | |||
| ifenslave | |||
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> |