summaryrefslogtreecommitdiffstats
path: root/drivers/parisc/gsc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-04 17:19:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-04 17:19:01 +0100
commit4edfd20fafae41d77f210417b43d1416a733f48c (patch)
tree09abc81bdc493783d3962a66fc857aee4f5e4b4e /drivers/parisc/gsc.c
parentdrivers: remove duplicated #include (diff)
parentlibata: mask off DET when restoring SControl for detach (diff)
downloadlinux-4edfd20fafae41d77f210417b43d1416a733f48c.tar.xz
linux-4edfd20fafae41d77f210417b43d1416a733f48c.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: 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 'drivers/parisc/gsc.c')
0 files changed, 0 insertions, 0 deletions