aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-28 22:47:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-28 22:47:44 -0700
commitdc710afe95ee9b263ab593c11d86a684f1606872 (patch)
tree2b4ea32bed1a010a3046069dd834f62bc071c92c /arch/x86_64
parent4da3dcf34671fa15c4f01101754106d97fc98e6e (diff)
parentab3b3fd38125be0242c2f94bf144b48054210882 (diff)
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: [libata] sata_promise: comment out duplicate PCI ID [PATCH] libata: improve EH action and EHI flag handling [PATCH] libata: fix eh_skip_recovery condition [PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling
Diffstat (limited to 'arch/x86_64')
0 files changed, 0 insertions, 0 deletions