diff options
author | 2009-12-16 02:18:36 -0500 | |
---|---|---|
committer | 2009-12-16 02:18:36 -0500 | |
commit | 8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4 (patch) | |
tree | 76cd9d4492d7fe4e2a90dbbc43127ca80ad93288 /kernel/resource.c | |
parent | Merge branch 'thinkpad-2.6.33' into release (diff) | |
parent | ACPI: Notify the _PPC evaluation status to the platform (diff) | |
download | wireguard-linux-8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4.tar.xz wireguard-linux-8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4.zip |
Merge branch 'ost' into release
Conflicts:
include/acpi/processor.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/resource.c')
0 files changed, 0 insertions, 0 deletions