summaryrefslogtreecommitdiffstats
path: root/drivers/ata/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-02 01:46:22 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-02 01:46:22 +0100
commit9ba5aa3126873a9c29999b78de20a52c5f87d389 (patch)
tree5ee7cc2c3465c3ef557f6f4e35e6c7cb67ece286 /drivers/ata/Kconfig
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentMerge branch 'tj-upstream-fixes' of git://htj.dyndns.org/libata-tj into tmp (diff)
downloadlinux-9ba5aa3126873a9c29999b78de20a52c5f87d389.tar.xz
linux-9ba5aa3126873a9c29999b78de20a52c5f87d389.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: [PATCH] libata: add missing sht->slave_destroy [PATCH] ahci: ignore PORT_IRQ_IF_ERR on JMB controllers
Diffstat (limited to 'drivers/ata/Kconfig')
0 files changed, 0 insertions, 0 deletions