linux/drivers/ata
Rafael J. Wysocki 98feb7cc61 Merge branch 'acpi-cleanup'
* acpi-cleanup: (22 commits)
  ACPI / tables: Return proper error codes from acpi_table_parse() and fix comment.
  ACPI / tables: Check if id is NULL in acpi_table_parse()
  ACPI / proc: Include appropriate header file in proc.c
  ACPI / EC: Remove unused functions and add prototype declaration in internal.h
  ACPI / dock: Include appropriate header file in dock.c
  ACPI / PCI: Include appropriate header file in pci_link.c
  ACPI / PCI: Include appropriate header file in pci_slot.c
  ACPI / EC: Mark the function acpi_ec_add_debugfs() as static in ec_sys.c
  ACPI / NVS: Include appropriate header file in nvs.c
  ACPI / OSL: Mark the function acpi_table_checksum() as static
  ACPI / processor: initialize a variable to silence compiler warning
  ACPI / processor: use ACPI_COMPANION() to get ACPI device
  ACPI: correct minor typos
  ACPI / sleep: Drop redundant acpi_disabled check
  ACPI / dock: Drop redundant acpi_disabled check
  ACPI / table: Replace '1' with specific error return values
  ACPI: remove trailing whitespace
  ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
  ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>
  SFI / ACPI: Fix warnings reported during builds with W=1
  ...

Conflicts:
	drivers/acpi/nvs.c
	drivers/hwmon/asus_atk0110.c
2014-01-12 23:44:09 +01:00
..
acard-ahci.c Merge branch 'libata/for-3.10-fixes' into libata/for-3.11 2013-07-02 19:54:16 -07:00
ahci_imx.c ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN 2013-12-03 07:39:19 -05:00
ahci_platform.c ahci: add support for IBM Akebono platform device 2013-11-22 17:38:18 -05:00
ahci.c ahci: add PCI ID for Marvell 88SE9170 SATA controller 2013-12-31 07:23:53 -05:00
ahci.h ahci: imx: setup power saving methods 2013-10-15 08:47:00 -04:00
ata_generic.c
ata_piix.c ata_piix: minor typo and a printk fix 2013-10-13 16:17:48 -04:00
Kconfig ahci_imx: depend on CONFIG_MFD_SYSCON 2013-07-26 08:57:56 -04:00
libahci.c Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 2013-11-13 15:18:22 +09:00
libata-acpi.c ACPI: Clean up inclusions of ACPI header files 2013-12-07 01:03:14 +01:00
libata-core.c libata: implement ATA_HORKAGE_NO_NCQ_TRIM and apply it to Micro M500 SSDs 2013-12-17 07:03:14 -05:00
libata-eh.c tree-wide: use reinit_completion instead of INIT_COMPLETION 2013-11-15 09:32:21 +09:00
libata-pmp.c libata: apply behavioral quirks to sil3826 PMP 2013-08-19 09:38:21 -04:00
libata-scsi.c Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 2013-12-24 09:35:58 -08:00
libata-sff.c libata: update "Maintained by:" tags 2013-05-14 11:13:04 -07:00
libata-transport.c libata: Fix display of sata speed 2013-10-27 07:43:25 -04:00
libata-transport.h
libata-zpodd.c ata: fix acpi_bus_get_device() return value check 2013-11-23 08:37:10 -05:00
libata.h ATA / ACPI: remove power dependent device handling 2013-10-17 15:38:53 +02:00
Makefile ahci_imx: add ahci sata support on imx platforms 2013-07-24 12:29:08 -04:00
pata_acpi.c ACPI: Clean up inclusions of ACPI header files 2013-12-07 01:03:14 +01:00
pata_ali.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_amd.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_arasan_cf.c pata_arasan_cf: add missing clk_disable_unprepare() on error path 2013-11-22 17:38:31 -05:00
pata_artop.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_at32.c ata: use dev_get_platdata() 2013-07-30 08:59:24 -04:00
pata_at91.c ata: use dev_get_platdata() 2013-07-30 08:59:24 -04:00
pata_atiixp.c
pata_atp867x.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_bf54x.c ata: use platform_{get,set}_drvdata() 2013-05-24 10:26:13 +09:00
pata_cmd64x.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_cmd640.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_cs5520.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_cs5530.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_cs5535.c
pata_cs5536.c pata_cs5536: add quirk for broken udma 2012-11-28 12:38:41 -05:00
pata_cypress.c
pata_efar.c
pata_ep93xx.c drivers/ata: don't check resource with devm_ioremap_resource 2013-05-12 15:19:46 +02:00
pata_hpt3x2n.c
pata_hpt3x3.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_hpt37x.c
pata_hpt366.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_icside.c Drivers: ata: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
pata_imx.c pata_imx: expose module alias for loading from device-tree 2013-07-29 12:13:08 -04:00
pata_isapnp.c pata_isapnp: Don't use invalid I/O ports 2013-10-07 15:17:32 -04:00
pata_it821x.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_it8213.c
pata_ixp4xx_cf.c DMA-API: others: use dma_set_coherent_mask() 2013-10-31 14:49:07 +00:00
pata_jmicron.c
pata_legacy.c pata_legacy: bogus clock in opti82c46x_set_piomode() 2013-04-03 19:53:10 -04:00
pata_macio.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_marvell.c
pata_mpc52xx.c ata: use platform_{get,set}_drvdata() 2013-05-24 10:26:13 +09:00
pata_mpiix.c
pata_netcell.c
pata_ninja32.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_ns87410.c
pata_ns87415.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_octeon_cf.c DMA-API: ata: pata_octeon_cf: convert to use dma_coerce_mask_and_coherent() 2013-10-31 14:48:49 +00:00
pata_of_platform.c Drivers: ata: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
pata_oldpiix.c
pata_opti.c
pata_optidma.c
pata_palmld.c Drivers: ata: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
pata_pcmcia.c drivers/ata: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:26:03 -07:00
pata_pdc202xx_old.c
pata_pdc2027x.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_piccolo.c
pata_platform.c ata: use dev_get_platdata() 2013-07-30 08:59:24 -04:00
pata_pxa.c ata: use dev_get_platdata() 2013-07-30 08:59:24 -04:00
pata_radisys.c
pata_rb532_cf.c Drivers: ata: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
pata_rdc.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_rz1000.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_samsung_cf.c ata: pata_samsung_cf: add missing __iomem annotation 2013-08-09 10:12:23 -04:00
pata_sc1200.c
pata_scc.c
pata_sch.c Drivers: ata: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
pata_serverworks.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_sil680.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_sis.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_sl82c105.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_triflex.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pata_via.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
pdc_adma.c libata: update "Maintained by:" tags 2013-05-14 11:13:04 -07:00
sata_dwc_460ex.c powerpc: add missing explicit OF includes for ppc 2013-11-11 09:10:50 -06:00
sata_fsl.c drivers: clean-up prom.h implicit includes 2013-10-09 20:04:04 -05:00
sata_highbank.c sata_highbank: clear whole array in highbank_initialize_phys() 2013-10-27 08:11:54 -04:00
sata_inic162x.c libata: make it clear that sata_inic162x is experimental 2013-07-22 17:11:14 -04:00
sata_mv.c sata_mv: Remove unneeded CONFIG_HAVE_CLK ifdefs 2013-07-30 09:03:01 -04:00
sata_nv.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
sata_promise.c update contact information for Mikael Pettersson 2013-09-25 13:27:42 -07:00
sata_promise.h
sata_qstor.c
sata_rcar.c sata_rcar: Convert to clk_prepare/unprepare 2013-10-29 14:40:44 -04:00
sata_sil24.c ata: use pci_get_drvdata() 2013-06-02 22:22:03 -07:00
sata_sil.c Merge branch 'libata/for-3.10-fixes' into libata/for-3.11 2013-07-02 19:54:16 -07:00
sata_sis.c sata_sis: missing PM support 2014-01-01 15:14:40 -05:00
sata_svw.c sata_svw: switch to ->show_info() 2013-04-09 14:13:28 -04:00
sata_sx4.c libata: update "Maintained by:" tags 2013-05-14 11:13:04 -07:00
sata_uli.c
sata_via.c libata: update "Maintained by:" tags 2013-05-14 11:13:04 -07:00
sata_vsc.c Drivers: ata: remove __dev* attributes. 2013-01-03 15:57:03 -08:00
sis.h