diff options
author | 2013-03-23 12:33:36 -0700 | |
---|---|---|
committer | 2013-03-23 12:33:36 -0700 | |
commit | c8c1f16717b05a9f787e054ada1ddd6dbb910364 (patch) | |
tree | 9a34b44254863d390655491d286720262f1e725d /net/unix/af_unix.c | |
parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (diff) | |
parent | pata_samsung_cf: use module_platform_driver_probe() (diff) | |
download | wireguard-linux-c8c1f16717b05a9f787e054ada1ddd6dbb910364.tar.xz wireguard-linux-c8c1f16717b05a9f787e054ada1ddd6dbb910364.zip |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata updates from Jeff Garzik:
"Simple stuff. See one-line summaries."
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_samsung_cf: use module_platform_driver_probe()
[libata] Avoid specialized TLA's in ZPODD's Kconfig
libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
sata_fsl: Remove redundant NULL check before kfree
ahci: Add Device IDs for Intel Wellsburg PCH
ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions