summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 19:19:17 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 19:19:17 +0100
commitabce00f962a11ed6f748c2569e11695a30716b53 (patch)
treef76a7d999dc47bb84cc72b2691aa47080ef97262 /drivers/pnp
parentMerge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentahci: support the STA2X11 I/O Hub (diff)
downloadlinux-abce00f962a11ed6f748c2569e11695a30716b53.tar.xz
linux-abce00f962a11ed6f748c2569e11695a30716b53.zip
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev: ahci: support the STA2X11 I/O Hub pata_bf54x: fix BMIDE status register emulation ata: add ata port hibernate callbacks ata: update ata port's runtime status during system resume [SCSI] runtime resume parent for child's system-resume ahci: platform support for suspend/resume libata-core: kill duplicate statement in ata_do_set_mode() pata_of_platform: remove direct dependency on OF_IRQ SATA/PATA: convert drivers/ata/* to use module_platform_driver() pata_cs5536: forward port changes from cs5536 libata-sff: use ATAPI_{COD|IO} ata: add ata port runtime PM callbacks ata: add ata port system PM callbacks [SCSI] sd: check runtime PM status in sd_shutdown [SCSI] check runtime PM status in system PM [SCSI] add flag to skip the runtime PM calls on the host ata: make ata port as parent device of scsi host ahci: start engine only during soft/hard resets
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions