Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (513fd370) · Commits · Tomeu Vizoso / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

513fd370

Commit 513fd370 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 709772e6 68c28898

No related branches found

No related tags found

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/7990.c 5 additions, 1 deletion

drivers/net/7990.c
drivers/net/atlx/atl1.c 0 additions, 17 deletions

drivers/net/atlx/atl1.c
drivers/net/ehea/ehea_main.c 10 additions, 6 deletions

drivers/net/ehea/ehea_main.c
drivers/net/forcedeth.c 20 additions, 0 deletions

drivers/net/forcedeth.c
drivers/net/ixgbe/ixgbe_82598.c 2 additions, 2 deletions

drivers/net/ixgbe/ixgbe_82598.c
drivers/net/s2io.c 6 additions, 4 deletions

drivers/net/s2io.c
drivers/net/sfc/falcon.c 3 additions, 1 deletion

drivers/net/sfc/falcon.c
drivers/net/sky2.c 2 additions, 0 deletions

drivers/net/sky2.c
drivers/net/virtio_net.c 45 additions, 7 deletions

drivers/net/virtio_net.c
drivers/s390/net/qeth_core_main.c 15 additions, 34 deletions

drivers/s390/net/qeth_core_main.c
drivers/s390/net/qeth_core_offl.c 2 additions, 4 deletions

drivers/s390/net/qeth_core_offl.c
drivers/s390/net/qeth_core_sys.c 0 additions, 12 deletions

drivers/s390/net/qeth_core_sys.c
drivers/s390/net/qeth_l2_main.c 16 additions, 25 deletions

drivers/s390/net/qeth_l2_main.c
drivers/s390/net/qeth_l3_main.c 24 additions, 51 deletions

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

drivers/s390/net/qeth_l3_sys.c
include/linux/virtio_net.h 1 addition, 1 deletion

include/linux/virtio_net.h

with 151 additions and 189 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