Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b286e392

Commit b286e392 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

parents bcb6ad1f 6593178d

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

drivers/ide/ide-cd.c 1 addition, 1 deletion

drivers/ide/ide-cd.c
drivers/ide/ide-disk.c 1 addition, 1 deletion

drivers/ide/ide-disk.c
drivers/ide/ide-floppy.c 1 addition, 1 deletion

drivers/ide/ide-floppy.c
drivers/ide/ide-lib.c 4 additions, 4 deletions

drivers/ide/ide-lib.c
drivers/ide/ide-tape.c 1 addition, 1 deletion

drivers/ide/ide-tape.c
drivers/ide/pci/aec62xx.c 0 additions, 47 deletions

drivers/ide/pci/aec62xx.c
drivers/ide/pci/alim15x3.c 7 additions, 2 deletions

drivers/ide/pci/alim15x3.c
drivers/ide/pci/cs5520.c 2 additions, 3 deletions

drivers/ide/pci/cs5520.c
drivers/ide/pci/siimage.c 7 additions, 1 deletion

drivers/ide/pci/siimage.c
drivers/ide/pci/via82cxxx.c 114 additions, 263 deletions

drivers/ide/pci/via82cxxx.c
drivers/ide/ppc/pmac.c 0 additions, 14 deletions

drivers/ide/ppc/pmac.c
drivers/ide/setup-pci.c 1 addition, 1 deletion

drivers/ide/setup-pci.c
drivers/scsi/ide-scsi.c 1 addition, 1 deletion

drivers/scsi/ide-scsi.c
include/linux/ide.h 3 additions, 1 deletion

include/linux/ide.h

with 143 additions and 341 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