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

e74b3f7d

Commit e74b3f7d authored 16 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

parents 13e620e0 59f8500e

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 6 additions, 1 deletion

MAINTAINERS
arch/arm/mach-ixp4xx/include/mach/qmgr.h 33 additions, 2 deletions

arch/arm/mach-ixp4xx/include/mach/qmgr.h
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c 33 additions, 11 deletions

arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
drivers/net/arm/Kconfig 1 addition, 1 deletion

drivers/net/arm/Kconfig
drivers/net/arm/ixp4xx_eth.c 173 additions, 164 deletions

drivers/net/arm/ixp4xx_eth.c
drivers/net/wan/Kconfig 7 additions, 0 deletions

drivers/net/wan/Kconfig
drivers/net/wan/Makefile 1 addition, 0 deletions

drivers/net/wan/Makefile
drivers/net/wan/hdlc_ppp.c 6 additions, 5 deletions

drivers/net/wan/hdlc_ppp.c
drivers/net/wan/ixp4xx_hss.c 1325 additions, 0 deletions

drivers/net/wan/ixp4xx_hss.c

with 1585 additions and 184 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