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

030352a9

Commit 030352a9 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents e6e30add 0c1aa20f

No related branches found

No related tags found

No related merge requests found

Changes 22

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/Kconfig 13 additions, 1 deletion

drivers/net/Kconfig
drivers/net/Makefile 2 additions, 0 deletions

drivers/net/Makefile
drivers/net/a2065.c 0 additions, 4 deletions

drivers/net/a2065.c
drivers/net/atarilance.c 1 addition, 1 deletion

drivers/net/atarilance.c
drivers/net/declance.c 0 additions, 4 deletions

drivers/net/declance.c
drivers/net/e1000e/netdev.c 5 additions, 0 deletions

drivers/net/e1000e/netdev.c
drivers/net/hplance.c 2 additions, 2 deletions

drivers/net/hplance.c
drivers/net/igb/igb_main.c 6 additions, 1 deletion

drivers/net/igb/igb_main.c
drivers/net/ixgbe/ixgbe_main.c 6 additions, 1 deletion

drivers/net/ixgbe/ixgbe_main.c
drivers/net/lib8390.c 4 additions, 0 deletions

drivers/net/lib8390.c
drivers/net/mac8390.c 3 additions, 5 deletions

drivers/net/mac8390.c
drivers/net/macb.c 5 additions, 1 deletion

drivers/net/macb.c
drivers/net/macsonic.c 8 additions, 11 deletions

drivers/net/macsonic.c
drivers/net/sh_eth.c 1174 additions, 0 deletions

drivers/net/sh_eth.c
drivers/net/sh_eth.h 464 additions, 0 deletions

drivers/net/sh_eth.h
drivers/net/smc911x.c 186 additions, 237 deletions

drivers/net/smc911x.c
drivers/net/smc911x.h 279 additions, 216 deletions

drivers/net/smc911x.h
drivers/net/sunlance.c 0 additions, 4 deletions

drivers/net/sunlance.c
drivers/net/usb/Kconfig 10 additions, 0 deletions

drivers/net/usb/Kconfig
drivers/net/usb/Makefile 1 addition, 0 deletions

drivers/net/usb/Makefile

with 2169 additions and 488 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