]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73f0533 b24e509)
Merge branch 'd3' into release
authorLen Brown <len.brown@intel.com>
Fri, 30 Mar 2012 20:21:26 +0000 (16:21 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 30 Mar 2012 20:21:26 +0000 (16:21 -0400)
commitec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d
tree67e4709b760582bdca00e596a2ea68bafb4ccc09tree
parent73f05330497b98c45d157b7d0c60673798bb4c3bcommit | diff
parentb24e5098853653554baf6ec975b9e855f3d6e5c0commit | diff
Merge branch 'd3' into release

Conflicts:
drivers/acpi/sleep.c

This was a text conflict between
a2ef5c4fd44ce3922435139393b89f2cce47f576
(ACPI: Move module parameter gts and bfs to sleep.c)

which added #include <linux/module.h>

and

b24e5098853653554baf6ec975b9e855f3d6e5c0
(ACPI, PCI: Move acpi_dev_run_wake() to ACPI core)

which added #include <linux/pm_runtime.h>

The resolution was to take them both.

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/scan.c diff1 | diff2 | blob | history
drivers/acpi/sleep.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror