summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-07-05 13:03:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-07-05 13:03:43 +0200
commitdf958569dbaa398f525057729717e44809ac4306 (patch)
tree40b61e02cc4c1f40cfb968631ceed2110a5654cc /fs/splice.c
parentACPI / battery: Safe unregistering of hooks (diff)
parentACPI / PPTT: use ACPI ID whenever ACPI_PPTT_ACPI_PROCESSOR_ID_VALID is set (diff)
parentACPICA: Drop leading newlines from error messages (diff)
downloadlinux-df958569dbaa398f525057729717e44809ac4306.tar.xz
linux-df958569dbaa398f525057729717e44809ac4306.zip
Merge branches 'acpi-tables' and 'acpica'
Merge ACPICA regression fix and a fix for the recently added PPTT support. * acpi-tables: ACPI / PPTT: use ACPI ID whenever ACPI_PPTT_ACPI_PROCESSOR_ID_VALID is set * acpica: ACPICA: Drop leading newlines from error messages