aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-04 08:19:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-04 08:19:01 -0800
commit4edfd20fafae41d77f210417b43d1416a733f48c (patch)
tree09abc81bdc493783d3962a66fc857aee4f5e4b4e /kernel
parent54074d59320581a6d7e4f4dd405e8cac1d174b75 (diff)
parent299246f9a2a4c5c531863d72bad7ebd0de213de9 (diff)
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: mask off DET when restoring SControl for detach libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply it libata: Fix a potential race condition in ata_scsi_park_show() sata_nv: fix generic, nf2/3 detection regression sata_via: restore vt*_prepare_host error handling sata_promise: add ATA engine reset to reset ops
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions