Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (7ae8c5ec) · 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

7ae8c5ec

Commit 7ae8c5ec authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

parents e1f1def6 9f68a248

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

drivers/scsi/ahci.c 25 additions, 6 deletions

drivers/scsi/ahci.c
drivers/scsi/libata-core.c 29 additions, 35 deletions

drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c 43 additions, 34 deletions

drivers/scsi/libata-scsi.c
drivers/scsi/libata.h 0 additions, 2 deletions

drivers/scsi/libata.h
include/linux/libata.h 14 additions, 0 deletions

include/linux/libata.h

with 111 additions and 77 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