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

32bb93b0

Commit 32bb93b0 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 6edafaaf 3859069b

No related branches found

No related tags found

Loading

Changes 102

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/DocBook/z8530book.tmpl 12 additions, 26 deletions

Documentation/DocBook/z8530book.tmpl
arch/sh/include/asm/sh_eth.h 11 additions, 0 deletions

arch/sh/include/asm/sh_eth.h
drivers/char/pcmcia/synclink_cs.c 0 additions, 4 deletions

drivers/char/pcmcia/synclink_cs.c
drivers/char/synclink.c 0 additions, 4 deletions

drivers/char/synclink.c
drivers/char/synclink_gt.c 0 additions, 5 deletions

drivers/char/synclink_gt.c
drivers/char/synclinkmp.c 0 additions, 4 deletions

drivers/char/synclinkmp.c
drivers/net/3c523.c 1 addition, 3 deletions

drivers/net/3c523.c
drivers/net/3c527.c 3 additions, 6 deletions

drivers/net/3c527.c
drivers/net/3c59x.c 8 additions, 6 deletions

drivers/net/3c59x.c
drivers/net/8390.c 5 additions, 8 deletions

drivers/net/8390.c
drivers/net/8390p.c 8 additions, 11 deletions

drivers/net/8390p.c
drivers/net/Kconfig 3 additions, 2 deletions

drivers/net/Kconfig
drivers/net/atlx/atl1.c 11 additions, 8 deletions

drivers/net/atlx/atl1.c
drivers/net/atp.c 2 additions, 7 deletions

drivers/net/atp.c
drivers/net/bonding/bond_3ad.c 1 addition, 0 deletions

drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_main.c 172 additions, 222 deletions

drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_sysfs.c 0 additions, 3 deletions

drivers/net/bonding/bond_sysfs.c
drivers/net/de620.c 0 additions, 7 deletions

drivers/net/de620.c
drivers/net/dm9000.c 5 additions, 0 deletions

drivers/net/dm9000.c
drivers/net/e1000e/e1000.h 14 additions, 17 deletions

drivers/net/e1000e/e1000.h

with 256 additions and 343 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