diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 07:01:18 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 07:01:18 +0100 |
| commit | cfee47f99bc14a6d7c6b0be2284db2cef310a815 (patch) | |
| tree | 2974594b06534c199ea9c4b39492d5a708bb539a /net | |
| parent | ACPI: fix git automerge failure (diff) | |
| parent | ACPI: S4: Use "platform" rather than "shutdown" mode by default (diff) | |
| download | linux-cfee47f99bc14a6d7c6b0be2284db2cef310a815.tar.xz linux-cfee47f99bc14a6d7c6b0be2284db2cef310a815.zip | |
Pull bugfix into test branch
Conflicts:
kernel/power/disk.c
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions