Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (8cde0776) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

8cde0776

Commit 8cde0776 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 2ed5e6d0 b78612b7

No related merge requests found

Changes 36

Expand all Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/bnx2.c 390 additions, 78 deletions

drivers/net/bnx2.c
drivers/net/bnx2.h 115 additions, 4 deletions

drivers/net/bnx2.h
drivers/net/bnx2_fw.h 2527 additions, 1528 deletions

drivers/net/bnx2_fw.h
drivers/net/e1000/e1000_ethtool.c 1 addition, 1 deletion

drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_hw.c 70 additions, 31 deletions

drivers/net/e1000/e1000_hw.c
drivers/net/e1000/e1000_hw.h 0 additions, 42 deletions

drivers/net/e1000/e1000_hw.h
drivers/net/e1000/e1000_main.c 16 additions, 15 deletions

drivers/net/e1000/e1000_main.c
drivers/net/fec_8xx/Kconfig 1 addition, 1 deletion

drivers/net/fec_8xx/Kconfig
drivers/net/hamradio/dmascc.c 0 additions, 10 deletions

drivers/net/hamradio/dmascc.c
drivers/net/ixgb/ixgb_ethtool.c 1 addition, 1 deletion

drivers/net/ixgb/ixgb_ethtool.c
drivers/net/ixgb/ixgb_hw.c 22 additions, 9 deletions

drivers/net/ixgb/ixgb_hw.c
drivers/net/ixgb/ixgb_hw.h 0 additions, 17 deletions

drivers/net/ixgb/ixgb_hw.h
drivers/net/ixgb/ixgb_main.c 1 addition, 1 deletion

drivers/net/ixgb/ixgb_main.c
drivers/net/phy/cicada.c 0 additions, 1 deletion

drivers/net/phy/cicada.c
drivers/net/phy/davicom.c 0 additions, 1 deletion

drivers/net/phy/davicom.c
drivers/net/phy/lxt.c 0 additions, 1 deletion

drivers/net/phy/lxt.c
drivers/net/phy/marvell.c 0 additions, 1 deletion

drivers/net/phy/marvell.c
drivers/net/phy/mdio_bus.c 0 additions, 1 deletion

drivers/net/phy/mdio_bus.c
drivers/net/phy/phy.c 0 additions, 1 deletion

drivers/net/phy/phy.c
drivers/net/phy/phy_device.c 0 additions, 1 deletion

drivers/net/phy/phy_device.c

with 3144 additions and 1745 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