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

950f564b

Commit 950f564b authored 15 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6

parents b1681c56 8495fb1b

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/cdrom/ide-cd 2 additions, 37 deletions

Documentation/cdrom/ide-cd
drivers/ide/cmd640.c 1 addition, 1 deletion

drivers/ide/cmd640.c
drivers/ide/icside.c 60 additions, 4 deletions

drivers/ide/icside.c
drivers/ide/ide-cs.c 11 additions, 12 deletions

drivers/ide/ide-cs.c
drivers/ide/pdc202xx_old.c 2 additions, 2 deletions

drivers/ide/pdc202xx_old.c
drivers/ide/scc_pata.c 5 additions, 7 deletions

drivers/ide/scc_pata.c

with 81 additions and 63 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