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

96789ac4

Commit 96789ac4 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 77eebf34 958ddb75

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/8139cp.c 21 additions, 16 deletions

drivers/net/8139cp.c
drivers/net/sky2.c 0 additions, 77 deletions

drivers/net/sky2.c
drivers/net/sky2.h 0 additions, 1 deletion

drivers/net/sky2.h
drivers/net/via-velocity.c 3 additions, 0 deletions

drivers/net/via-velocity.c
net/ieee80211/ieee80211_rx.c 5 additions, 11 deletions

net/ieee80211/ieee80211_rx.c

with 29 additions and 105 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