diff options
author | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /kernel/power/disk.c | |
parent | 25c68a33b7b74b37793b1250007e5e21d621a7fc (diff) | |
parent | 7d63c6759188b9b35c789159f6e02cd02d49ec7d (diff) |
Pull trivial into test branch
Conflicts:
drivers/acpi/ec.c
Diffstat (limited to 'kernel/power/disk.c')
0 files changed, 0 insertions, 0 deletions