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

5ecccb74

Commit 5ecccb74 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

Conflicts:
	net/mac80211/rate.c

parents f6f22303 3d0beb92

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/sfc/efx.c 1 addition, 0 deletions

drivers/net/sfc/efx.c
drivers/net/sfc/qt202x_phy.c 1 addition, 1 deletion

drivers/net/sfc/qt202x_phy.c
drivers/net/via-velocity.c 20 additions, 21 deletions

drivers/net/via-velocity.c
drivers/net/wireless/ath/ath9k/xmit.c 2 additions, 2 deletions

drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/iwl-rx.c 4 additions, 1 deletion

drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwmc3200wifi/rx.c 1 addition, 1 deletion

drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/rtl818x/rtl8187_dev.c 1 addition, 0 deletions

drivers/net/wireless/rtl818x/rtl8187_dev.c
net/ipv4/igmp.c 1 addition, 1 deletion

net/ipv4/igmp.c
net/ipv4/tcp_input.c 2 additions, 4 deletions

net/ipv4/tcp_input.c
net/mac80211/rate.c 3 additions, 0 deletions

net/mac80211/rate.c

with 36 additions and 31 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