diff options
| author | Linus Torvalds | 2015-09-02 17:00:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-09-02 17:00:54 +0200 |
| commit | 2dc7e555e33e645df70a8aa89c529de1902f0064 (patch) | |
| tree | b93df621cb4a2777dd83d52e300ab81f938e0ed0 /drivers/ata/libata-core.c | |
| parent | Merge tag 'pm+acpi-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ata: pata_arasam_cf: Use devm_clk_get (diff) | |
| download | kernel-qcow2-linux-2dc7e555e33e645df70a8aa89c529de1902f0064.tar.gz kernel-qcow2-linux-2dc7e555e33e645df70a8aa89c529de1902f0064.tar.xz kernel-qcow2-linux-2dc7e555e33e645df70a8aa89c529de1902f0064.zip | |
Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
"Nothing interesting. A couple device specific minor updates and a
kernel doc change"
* 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: pata_arasam_cf: Use devm_clk_get
libata: fix libata-core.c kernel-doc warning
ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 790e0deb278e..b79cb10e289e 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -4753,6 +4753,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) /** * ata_qc_new_init - Request an available ATA command, and initialize it * @dev: Device from whom we request an available command structure + * @tag: tag * * LOCKING: * None. |