aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 10:15:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 10:15:06 -0700
commit5e23ae49960d05f578a73ecd19749c45af682c2b (patch)
tree86ff6d944e7dae60fe60f9ba485cc11129282ddf /scripts
parentbdc0077af574800d24318b6945cf2344e8dbb050 (diff)
parent641589bff714f39b33ef1d7f02eaa009f2993b64 (diff)
downloadlinux-linaro-stable-5e23ae49960d05f578a73ecd19749c45af682c2b.tar.gz
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata updates from Jeff Garzik: "Notable changes: - Updating libata to directly bind with ACPI / runtime power mgmt. This is a pre-req for SATA ZPODD (CD-ROM power management). Touches ACPI (exports++) and SCSI in minor ways. Has been in linux-next for weeks. The rest of this should come via SCSI tree, as it involves a lot of updates to the 'sr' driver etc. Other, minor changes: - module_pci_driver() removes a lot of common boilerplate from each PCI driver - minor coding style, whitespace cleanups - pata_pcmcia bug fix, caught by Coccinelle - pata_imx, sata_dwc_460ex minor vendor updates - ahci_platform: use simple PM ops, and thereby add hibernation cb's - Add a few device-specific quirks" * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits) [libata] pata_cmd64x: whitespace cleanup libata-acpi: fix up for acpi_pm_device_sleep_state API sata_dwc_460ex: device tree may specify dma_channel ahci, trivial: fixed coding style issues related to braces ahci_platform: add hibernation callbacks libata-eh.c: local functions should not be exposed globally libata-transport.c: local functions should not be exposed globally sata_dwc_460ex: support hardreset ata: use module_pci_driver drivers/ata/pata_pcmcia.c: adjust suspicious bit operation pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2 [libata] Prevent interface errors with Seagate FreeAgent GoFlex drivers/acpi/glue: revert accidental license-related 6b66d95895c bits libata-acpi: add missing inlines in libata.h libata: tell scsi layer device supports runtime power off libata: detect Device Attention support libata-acpi: register/unregister device to/from power resource libata-acpi: add ata port runtime D3Cold support libata-acpi: set acpi state for SATA port ...
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions