diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 08:18:36 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 08:18:36 +0100 |
| commit | 8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4 (patch) | |
| tree | 76cd9d4492d7fe4e2a90dbbc43127ca80ad93288 /fs/ext4 | |
| parent | Merge branch 'thinkpad-2.6.33' into release (diff) | |
| parent | ACPI: Notify the _PPC evaluation status to the platform (diff) | |
| download | linux-8fa79e08f50f4ec1fd8903eca6fd6f36c36dd4c4.tar.xz 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 'fs/ext4')
0 files changed, 0 insertions, 0 deletions