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

6332178d

Commit 6332178d authored 16 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/ppp_generic.c

parents 908a7a16 739840d5

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/bnx2.c 3 additions, 3 deletions

drivers/net/bnx2.c
drivers/net/jme.h 1 addition, 1 deletion

drivers/net/jme.h
drivers/net/phy/mdio_bus.c 3 additions, 2 deletions

drivers/net/phy/mdio_bus.c
drivers/net/ppp_generic.c 13 additions, 15 deletions

drivers/net/ppp_generic.c
drivers/net/starfire.c 5 additions, 0 deletions

drivers/net/starfire.c
include/net/irda/irda_device.h 3 additions, 1 deletion

include/net/irda/irda_device.h
net/bluetooth/rfcomm/core.c 0 additions, 2 deletions

net/bluetooth/rfcomm/core.c
net/socket.c 1 addition, 0 deletions

net/socket.c

with 29 additions and 24 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