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

dbbe68bb

Commit dbbe68bb authored 14 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

parents 7b26e5eb 9fc3bbb4

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

drivers/atm/atmtcp.c 4 additions, 1 deletion

drivers/atm/atmtcp.c
drivers/isdn/gigaset/capi.c 1 addition, 0 deletions

drivers/isdn/gigaset/capi.c
drivers/net/atlx/atl1.c 10 additions, 0 deletions

drivers/net/atlx/atl1.c
drivers/net/cnic.c 8 additions, 2 deletions

drivers/net/cnic.c
drivers/net/ehea/ehea_ethtool.c 7 additions, 0 deletions

drivers/net/ehea/ehea_ethtool.c
drivers/net/ppp_generic.c 7 additions, 2 deletions

drivers/net/ppp_generic.c
drivers/net/skfp/skfddi.c 1 addition, 1 deletion

drivers/net/skfp/skfddi.c
drivers/net/starfire.c 1 addition, 1 deletion

drivers/net/starfire.c
drivers/net/tg3.c 1 addition, 1 deletion

drivers/net/tg3.c
drivers/usb/atm/ueagle-atm.c 19 additions, 3 deletions

drivers/usb/atm/ueagle-atm.c
net/bridge/br_multicast.c 18 additions, 10 deletions

net/bridge/br_multicast.c
net/bridge/br_stp_bpdu.c 2 additions, 0 deletions

net/bridge/br_stp_bpdu.c
net/can/bcm.c 2 additions, 2 deletions

net/can/bcm.c
net/ipv4/route.c 6 additions, 2 deletions

net/ipv4/route.c

with 87 additions and 25 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