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

54c852a2

Commit 54c852a2 authored 16 years ago by Jeff Garzik Committed by Jeff Garzik 16 years ago

Downloads
- Plain Diff

Merge branch 'for-2.6.26' of git://git.farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream

parents 7ab267d4 ce4e2e45

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/mach-orion5x/common.c 2 additions, 0 deletions

arch/arm/mach-orion5x/common.c
arch/powerpc/platforms/chrp/pegasos_eth.c 4 additions, 0 deletions

arch/powerpc/platforms/chrp/pegasos_eth.c
arch/powerpc/sysdev/mv64x60_dev.c 2 additions, 0 deletions

arch/powerpc/sysdev/mv64x60_dev.c
arch/ppc/syslib/mv64x60.c 3 additions, 0 deletions

arch/ppc/syslib/mv64x60.c
drivers/net/mv643xx_eth.c 123 additions, 37 deletions

drivers/net/mv643xx_eth.c
include/linux/mv643xx_eth.h 14 additions, 2 deletions

include/linux/mv643xx_eth.h

with 148 additions and 39 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