diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
| commit | 99e711101c7822d9ddf39f16c026b97e16a9f517 (patch) | |
| tree | 97f9d3bc19a3595365e68115015e27f1d4e7009d /drivers/acpi/resource.c | |
| parent | f1dc154f82595386cddcc7b980d8760474c3dd2d (diff) | |
| parent | 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff) | |
Merge branch 'linus' into x86/cleanups, before applying dependent patch
Diffstat (limited to 'drivers/acpi/resource.c')
| -rw-r--r-- | drivers/acpi/resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 5589a6e2a023..8244f013f210 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -573,7 +573,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_resources); * @ares: Input ACPI resource object. * @types: Valid resource types of IORESOURCE_XXX * - * This is a hepler function to support acpi_dev_get_resources(), which filters + * This is a helper function to support acpi_dev_get_resources(), which filters * ACPI resource objects according to resource types. */ int acpi_dev_filter_resource_type(struct acpi_resource *ares, |