diff options
| author |   Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
| commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
| tree | 89b840115ccd753216ba0b26e587e52699b99310 /drivers/acpi/resource.c | |
| parent | intel powerclamp: support Knights Landing (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff) | |
| download | linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip | |
Merge branches 'release' and 'thermal-soc' of .git into next
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, |