summaryrefslogtreecommitdiffstats
path: root/arch/alpha
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 04:16:31 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-02 04:16:31 +0100
commitaefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 (patch)
tree1fd355ab8273cf6d3cc4d7f744370a8e8969a0a5 /arch/alpha
parent[PATCH] powerpc: Eliminate "exceeds stub group size" linker warning (diff)
parentRevert "[PATCH] Add 0x7110 piix to ata_piix.c" (diff)
downloadlinux-aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7.tar.xz
linux-aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: Revert "[PATCH] Add 0x7110 piix to ata_piix.c" [libata] sata_nv: Add PCI IDs [PATCH] ahci: fix status register check in ahci_softreset
Diffstat (limited to 'arch/alpha')
0 files changed, 0 insertions, 0 deletions