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

b3ed4bc0

Commit b3ed4bc0 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents ea2d8b59 753dcfee

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/ehea/ehea.h 1 addition, 1 deletion

drivers/net/ehea/ehea.h
drivers/net/ehea/ehea_qmr.c 52 additions, 5 deletions

drivers/net/ehea/ehea_qmr.c
drivers/net/ehea/ehea_qmr.h 3 additions, 0 deletions

drivers/net/ehea/ehea_qmr.h
drivers/net/ibm_newemac/core.c 1 addition, 1 deletion

drivers/net/ibm_newemac/core.c
drivers/net/mlx4/en_main.c 0 additions, 1 deletion

drivers/net/mlx4/en_main.c
drivers/net/mlx4/fw.c 1 addition, 1 deletion

drivers/net/mlx4/fw.c
drivers/net/tulip/dmfe.c 11 additions, 1 deletion

drivers/net/tulip/dmfe.c
drivers/net/usb/dm9601.c 15 additions, 0 deletions

drivers/net/usb/dm9601.c
drivers/net/via-velocity.c 7 additions, 4 deletions

drivers/net/via-velocity.c
drivers/net/wan/syncppp.c 3 additions, 2 deletions

drivers/net/wan/syncppp.c
drivers/s390/net/qeth_core_main.c 2 additions, 1 deletion

drivers/s390/net/qeth_core_main.c
drivers/s390/net/qeth_l2_main.c 9 additions, 18 deletions

drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c 1 addition, 12 deletions

drivers/s390/net/qeth_l3_main.c
drivers/s390/net/qeth_l3_sys.c 0 additions, 7 deletions

drivers/s390/net/qeth_l3_sys.c

with 106 additions and 54 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