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

dad1e54b

Commit dad1e54b authored 15 years ago by David S. Miller

Downloads
- Plain Diff

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

Conflicts:
	drivers/net/pcmcia/smc91c92_cs.c
	drivers/net/virtio_net.c

parents 1253332f 0110d6f2

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

drivers/net/e1000e/netdev.c
drivers/net/forcedeth.c 1 addition, 1 deletion

drivers/net/forcedeth.c
drivers/net/igb/igb_ethtool.c 1 addition, 0 deletions

drivers/net/igb/igb_ethtool.c
drivers/net/igb/igb_main.c 1 addition, 0 deletions

drivers/net/igb/igb_main.c
drivers/net/pcmcia/smc91c92_cs.c 6 additions, 7 deletions

drivers/net/pcmcia/smc91c92_cs.c
drivers/net/tun.c 4 additions, 0 deletions

drivers/net/tun.c
drivers/net/virtio_net.c 1 addition, 0 deletions

drivers/net/virtio_net.c
net/can/raw.c 1 addition, 1 deletion

net/can/raw.c

with 17 additions and 9 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