summaryrefslogtreecommitdiff
path: root/Documentation/acpi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 12:00:22 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-17 12:00:22 -0700
commitbf32d52c455d933cc9a459bb94af9ea8b5850af9 (patch)
tree0d6af119b141e46e120ad06c867fe82ac3c00f1c /Documentation/acpi
parent0c375501be6e6dc23c11ebfa394434517444e62d (diff)
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
Merge 3.10-rc6 into tty-next
We want the changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/acpi')
0 files changed, 0 insertions, 0 deletions