summaryrefslogtreecommitdiff
path: root/include/acpi/acpiosxf.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-18 04:53:28 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-18 04:53:28 +0400
commitbcef50814c9de8e0672d3e7f9f1abd85e1b95d13 (patch)
tree751337a429d58b60e03e22d2a30fccd87e1bc02a /include/acpi/acpiosxf.h
parentd2716578e439a5a693d0817e8ab89802b33b4ded (diff)
parent7919010c4224e07b871f3b5513d245cc029fcd67 (diff)
downloadlinux-bcef50814c9de8e0672d3e7f9f1abd85e1b95d13.tar.xz
Merge branch 'acpi-config' into acpica
Conflicts: include/acpi/platform/aclinux.h
Diffstat (limited to 'include/acpi/acpiosxf.h')
0 files changed, 0 insertions, 0 deletions