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

7bece815

Commit 7bece815 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

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

parents b9a2f2e4 bdefff1f

No related branches found

No related tags found

No related merge requests found

Changes 48

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/3c509.c 1 addition, 1 deletion

drivers/net/3c509.c
drivers/net/au1000_eth.c 1 addition, 6 deletions

drivers/net/au1000_eth.c
drivers/net/bfin_mac.c 0 additions, 1 deletion

drivers/net/bfin_mac.c
drivers/net/cpmac.c 179 additions, 55 deletions

drivers/net/cpmac.c
drivers/net/dm9000.c 1 addition, 1 deletion

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

drivers/net/e1000e/netdev.c
drivers/net/ehea/ehea_main.c 2 additions, 3 deletions

drivers/net/ehea/ehea_main.c
drivers/net/forcedeth.c 1 addition, 0 deletions

drivers/net/forcedeth.c
drivers/net/fs_enet/fs_enet-main.c 1 addition, 1 deletion

drivers/net/fs_enet/fs_enet-main.c
drivers/net/hamradio/scc.c 2 additions, 1 deletion

drivers/net/hamradio/scc.c
drivers/net/myri10ge/myri10ge.c 1 addition, 1 deletion

drivers/net/myri10ge/myri10ge.c
drivers/net/pcmcia/fmvj18x_cs.c 3 additions, 1 deletion

drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/xirc2ps_cs.c 8 additions, 4 deletions

drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/pcnet32.c 2 additions, 2 deletions

drivers/net/pcnet32.c
drivers/net/phy/Kconfig 1 addition, 1 deletion

drivers/net/phy/Kconfig
drivers/net/phy/phy_device.c 1 addition, 0 deletions

drivers/net/phy/phy_device.c
drivers/net/s2io-regs.h 1 addition, 1 deletion

drivers/net/s2io-regs.h
drivers/net/s2io.c 293 additions, 201 deletions

drivers/net/s2io.c
drivers/net/s2io.h 15 additions, 7 deletions

drivers/net/s2io.h
drivers/net/sb1250-mac.c 31 additions, 36 deletions

drivers/net/sb1250-mac.c

with 546 additions and 325 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