Merge branch 'for-2.6.25' of... (52920df4) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

52920df4

Commit 52920df4 authored 17 years ago by Paul Mackerras

Downloads
- Plain Diff

Merge branch 'for-2.6.25' of...

Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into for-2.6.25

parents 0173d422 9cd55be4

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

arch/powerpc/configs/pasemi_defconfig 2 additions, 2 deletions

arch/powerpc/configs/pasemi_defconfig
arch/powerpc/platforms/pasemi/Kconfig 0 additions, 9 deletions

arch/powerpc/platforms/pasemi/Kconfig
arch/powerpc/platforms/pasemi/Makefile 0 additions, 1 deletion

arch/powerpc/platforms/pasemi/Makefile
arch/powerpc/platforms/pasemi/electra_ide.c 0 additions, 96 deletions

arch/powerpc/platforms/pasemi/electra_ide.c
arch/powerpc/platforms/pasemi/idle.c 1 addition, 4 deletions

arch/powerpc/platforms/pasemi/idle.c
arch/powerpc/platforms/pasemi/setup.c 3 additions, 9 deletions

arch/powerpc/platforms/pasemi/setup.c
drivers/ata/Kconfig 11 additions, 1 deletion

drivers/ata/Kconfig
drivers/ata/Makefile 1 addition, 0 deletions

drivers/ata/Makefile
drivers/ata/pata_of_platform.c 114 additions, 0 deletions

drivers/ata/pata_of_platform.c
drivers/ata/pata_platform.c 86 additions, 58 deletions

drivers/ata/pata_platform.c
include/linux/pata_platform.h 9 additions, 0 deletions

include/linux/pata_platform.h

with 227 additions and 180 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