diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 22:35:53 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 22:38:59 +0200 |
| commit | d326f44e5f2204c7a24db69bfc6dd3fe5f86182b (patch) | |
| tree | 21473db646b06fd462bbc8f3690732ba1bb2d018 /drivers/cpuidle | |
| parent | Merge branch 'd3' into release (diff) | |
| parent | Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-d326f44e5f2204c7a24db69bfc6dd3fe5f86182b.tar.xz linux-d326f44e5f2204c7a24db69bfc6dd3fe5f86182b.zip | |
Merge branch 'tboot' into release
Conflicts:
drivers/acpi/acpica/hwsleep.c
Text conflict between:
2feec47d4c5f80b05f1650f5a24865718978eea4
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)
which removed #include "actables.h"
and
09f98a825a821f7a3f1b162f9ed023f37213a63b
(x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.)
which removed #include <linux/tboot.h>
The resolution is to remove them both.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions