diff options
author | 2006-12-16 00:45:07 -0500 | |
---|---|---|
committer | 2006-12-16 00:45:07 -0500 | |
commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /drivers/acpi/dock.c | |
parent | ACPI: ibm_acpi: respond to workqueue update (diff) | |
parent | ACPI: ibm-acpi: new ibm-acpi maintainer (diff) | |
download | linux-dev-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.xz linux-dev-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.zip |
Pull trivial into test branch
Conflicts:
drivers/acpi/ec.c
Diffstat (limited to 'drivers/acpi/dock.c')
0 files changed, 0 insertions, 0 deletions