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

fe05f541

Commit fe05f541 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

parents e5cef95d 67bc6200

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/char/pcmcia/cm4000_cs.c 21 additions, 3 deletions

drivers/char/pcmcia/cm4000_cs.c
drivers/char/pcmcia/cm4040_cs.c 20 additions, 3 deletions

drivers/char/pcmcia/cm4040_cs.c
drivers/ide/legacy/ide-cs.c 1 addition, 0 deletions

drivers/ide/legacy/ide-cs.c
drivers/net/pcmcia/axnet_cs.c 1 addition, 0 deletions

drivers/net/pcmcia/axnet_cs.c
drivers/net/wireless/hostap/hostap_cs.c 4 additions, 1 deletion

drivers/net/wireless/hostap/hostap_cs.c
drivers/pcmcia/ds.c 22 additions, 18 deletions

drivers/pcmcia/ds.c
include/pcmcia/device_id.h 9 additions, 0 deletions

include/pcmcia/device_id.h

with 78 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