黄涛 7fe47454f2 Merge tag 'lsk-android-14.04' into develop-3.10 ...

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h

2014-04-24 19:04:10 +08:00

..

acard-ahci.c

libata: update "Maintained by:" tags

2013-05-14 11:13:04 -07:00

ahci_platform.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

ahci.c

ahci: disable NCQ on Samsung pci-e SSDs on macbooks

2014-03-06 21:30:08 -08:00

ahci.h

libata: update "Maintained by:" tags

2013-05-14 11:13:04 -07:00

ata_generic.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

ata_piix.c

ata: Fix DVD not dectected at some platform with Wellsburg PCH

2013-08-04 16:50:55 +08:00

Kconfig

libata: make it clear that sata_inic162x is experimental

2013-08-04 16:50:55 +08:00

libahci.c

ahci: disabled FBS prior to issuing software reset

2013-12-04 10:56:13 -08:00

libata-acpi.c

libata-acpi: add back ACPI based hotplug functionality

2013-06-25 00:51:33 +02:00

libata-core.c

Merge tag 'lsk-android-14.04' into develop-3.10

2014-04-24 19:04:10 +08:00

libata-eh.c

libata: make ata_eh_qc_retry() bump scmd->allowed on bogus failures

2013-11-13 12:05:31 +09:00

libata-pmp.c

ata: enable quirk from jmicron JMB350 for JMB394

2014-03-06 21:30:08 -08:00

libata-scsi.c

libata: disable LPM for some WD SATA-I devices

2014-02-06 11:08:16 -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-12-04 10:55:51 -08:00

libata-transport.h

[libata] Add ATA transport class

2010-10-21 20:21:03 -04:00

libata-zpodd.c

libata-zpodd: must use ata_tf_init()

2013-07-25 14:07:27 -07:00

libata.h

libata-acpi: add back ACPI based hotplug functionality

2013-06-25 00:51:33 +02:00

Makefile

libata: add R-Car SATA driver

2013-02-20 17:10:53 -05:00

pata_acpi.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_ali.c

pata_ali: fix "Satelite" typo

2011-10-14 13:10:42 -04:00

pata_amd.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_arasan_cf.c

ata: arasan: remove the need for platform_data

2013-04-19 22:25:51 +02:00

pata_artop.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_at32.c

pata_at32: use module_platform_driver_probe()

2013-04-03 19:52:10 -04:00

pata_at91.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_atiixp.c

pata_atiixp: override cable detection on MSI E350DM-E33

2012-08-17 13:26:51 -04:00

pata_atp867x.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_bf54x.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_cmd64x.c

ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

2012-11-28 12:40:15 -05:00

pata_cmd640.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_cs5520.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_cs5530.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_cs5535.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_cs5536.c

pata_cs5536: add quirk for broken udma

2012-11-28 12:38:41 -05:00

pata_cypress.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_efar.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_ep93xx.c

drivers/ata: don't check resource with devm_ioremap_resource

2013-05-12 15:19:46 +02:00

pata_hpt3x2n.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_hpt3x3.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_hpt37x.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_hpt366.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_icside.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_imx.c

pata_imx: add devicetree support

2013-04-11 19:38:00 -04:00

pata_isapnp.c

[libata] Improve timeout handling

2009-03-24 22:52:39 -04:00

pata_it821x.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_it8213.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_ixp4xx_cf.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_jmicron.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_legacy.c

pata_legacy: bogus clock in opti82c46x_set_piomode()

2013-04-03 19:53:10 -04:00

pata_macio.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_marvell.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_mpc52xx.c

Merge remote-tracking branch 'agust/next' into next

2013-02-20 11:39:05 +11:00

pata_mpiix.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_netcell.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_ninja32.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_ns87410.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_ns87415.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_octeon_cf.c

pata_octeon_cf: Use resource_size function

2013-04-03 19:53:30 -04:00

pata_of_platform.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_oldpiix.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_opti.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_optidma.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

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

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_pdc2027x.c

pata_pdc2027x: Fix compiler warning

2013-04-12 15:24:12 +02:00

pata_piccolo.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_platform.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_pxa.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_radisys.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_rb532_cf.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_rdc.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_rz1000.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_samsung_cf.c

pata_samsung_cf: use module_platform_driver_probe()

2013-03-04 17:12:52 -05:00

pata_sc1200.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_scc.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_sch.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_serverworks.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_sil680.c

Drivers: ata: remove __dev* attributes.

2013-01-03 15:57:03 -08:00

pata_sis.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_sl82c105.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_triflex.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pata_via.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

pdc_adma.c

libata: update "Maintained by:" tags

2013-05-14 11:13:04 -07:00

sata_dwc_460ex.c

sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644)

2012-12-14 09:43:39 -05:00

sata_fsl.c

sata_fsl: save irqs while coalescing

2013-08-29 09:47:38 -07:00

sata_highbank.c

sata_highbank: increase retry count but shorten duration for Calxeda controller

2013-07-25 14:07:28 -07:00

sata_inic162x.c

libata: make it clear that sata_inic162x is experimental

2013-08-04 16:50:55 +08:00

sata_mv.c

ata: sata_mv: fix disk hotplug for Armada 370/XP SoCs

2014-02-06 11:08:16 -08:00

sata_nv.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

sata_promise.c

libata: update "Maintained by:" tags

2013-05-14 11:13:04 -07:00

sata_promise.h

libata annotations and fixes

2008-01-23 05:24:15 -05:00

sata_qstor.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

sata_rcar.c

sata_rcar: fix interrupt handling

2013-06-02 00:54:45 -07:00

sata_sil24.c

sata_sil24: remove unused variable from sata_sil24.c

2012-11-28 12:39:20 -05:00

sata_sil.c

sata_sil: apply MOD15WRITE quirk to TOSHIBA MK2561GSYN

2014-03-06 21:30:09 -08:00

sata_sis.c

ata: use module_pci_driver

2012-07-25 15:12:11 -04: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

ata: use module_pci_driver

2012-07-25 15:12:11 -04:00

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

libata: PATA-mode fixes for sis_sata

2007-07-02 10:17:42 -04:00