summaryrefslogtreecommitdiff
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-23 00:48:20 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-23 00:48:20 +0400
commit74fc9cb2b950e3017e9df04a02a29e7cc92dc5a1 (patch)
tree750f65af1dea6418dd2c2b9b7c7b30bd131da39e /drivers/acpi/dock.c
parent76540969b1cf26349eb8867b57657b03c89025e5 (diff)
parenta3ccfcc1e7b52047c840249e30008678ac1046c3 (diff)
downloadlinux-74fc9cb2b950e3017e9df04a02a29e7cc92dc5a1.tar.xz
Merge branch 'acpica' into acpi-hotplug
The subsequent commits depend on the 'acpica' material.
Diffstat (limited to 'drivers/acpi/dock.c')
0 files changed, 0 insertions, 0 deletions