Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

04488734

Commit 04488734 authored 15 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 54831a83 c4d49794

No related branches found

Tags v2.6.28-rc1

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/networking/ip-sysctl.txt 4 additions, 4 deletions

Documentation/networking/ip-sysctl.txt
MAINTAINERS 2 additions, 2 deletions

MAINTAINERS
drivers/net/e1000/e1000_main.c 18 additions, 1 deletion

drivers/net/e1000/e1000_main.c
drivers/net/sfc/falcon_boards.c 27 additions, 18 deletions

drivers/net/sfc/falcon_boards.c
drivers/net/sfc/mcdi.c 1 addition, 1 deletion

drivers/net/sfc/mcdi.c
drivers/net/tc35815.c 0 additions, 1 deletion

drivers/net/tc35815.c
drivers/net/usb/cdc_ether.c 5 additions, 0 deletions

drivers/net/usb/cdc_ether.c
drivers/net/wireless/iwlwifi/iwl-4965.c 1 addition, 1 deletion

drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c 3 additions, 5 deletions

drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-core.c 1 addition, 1 deletion

drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h 2 additions, 0 deletions

drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-tx.c 20 additions, 2 deletions

drivers/net/wireless/iwlwifi/iwl-tx.c
net/core/net-sysfs.c 2 additions, 1 deletion

net/core/net-sysfs.c
net/ipv4/devinet.c 6 additions, 1 deletion

net/ipv4/devinet.c
net/ipv6/addrconf.c 14 additions, 2 deletions

net/ipv6/addrconf.c

with 106 additions and 40 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment