diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 16:21:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 16:21:26 -0400 |
| commit | ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d (patch) | |
| tree | 67e4709b760582bdca00e596a2ea68bafb4ccc09 /security/apparmor | |
| parent | 73f05330497b98c45d157b7d0c60673798bb4c3b (diff) | |
| parent | b24e5098853653554baf6ec975b9e855f3d6e5c0 (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>
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions