summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/aperture_64.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-23 04:46:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-23 04:46:29 +0200
commitd5a30458a90597915977f06e79406b664a41b8ac (patch)
tree377cf40e56f3503b031a40ac242a9368cf2cfb20 /arch/x86/kernel/aperture_64.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff)
parentlibata: ensure NCQ error result taskfile is fully initialized (diff)
downloadlinux-d5a30458a90597915977f06e79406b664a41b8ac.tar.xz
linux-d5a30458a90597915977f06e79406b664a41b8ac.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf. libata: fix docs, RE port and device of libata.force ID separated by point pata_pcmcia/ide-cs: add IDs for transcend and kingston cards libata: fix locking around blk_abort_request()
Diffstat (limited to 'arch/x86/kernel/aperture_64.c')
0 files changed, 0 insertions, 0 deletions