Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (44779149) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

44779149

Commit 44779149 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 8ee3f402 17514e8a

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

drivers/ide/ide-cd.c 2 additions, 2 deletions

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, 4 deletions

drivers/ide/ide-floppy.c
drivers/ide/ide-io.c 0 additions, 6 deletions

drivers/ide/ide-io.c
drivers/ide/ide-tape.c 1 addition, 4 deletions

drivers/ide/ide-tape.c
drivers/ide/ide-taskfile.c 3 additions, 24 deletions

drivers/ide/ide-taskfile.c
drivers/ide/pci/sis5513.c 1 addition, 0 deletions

drivers/ide/pci/sis5513.c
drivers/ide/pci/via82cxxx.c 21 additions, 9 deletions

drivers/ide/pci/via82cxxx.c
include/linux/hdreg.h 4 additions, 2 deletions

include/linux/hdreg.h
include/linux/ide.h 0 additions, 26 deletions

include/linux/ide.h
include/linux/pci_ids.h 2 additions, 0 deletions

include/linux/pci_ids.h

with 36 additions and 78 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