diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-12-11 22:15:57 -0800 |
| commit | 76d8a23b127020472207b281427d3e9f4f1227e4 (patch) | |
| tree | e14d7063d96d850fb259115d6fb08cbeb98ccf88 /include/acpi/acexcep.h | |
| parent | eba3b670a9166a91be5a11fe33290dca6b9457a2 (diff) | |
| parent | 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.
Conflicts:
drivers/power/ab8500_btemp.c
drivers/power/ab8500_charger.c
drivers/power/ab8500_fg.c
drivers/power/abx500_chargalg.c
drivers/power/max8925_power.c
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'include/acpi/acexcep.h')
| -rw-r--r-- | include/acpi/acexcep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h index 19503449814f..6c3890e02140 100644 --- a/include/acpi/acexcep.h +++ b/include/acpi/acexcep.h @@ -122,7 +122,7 @@ #define AE_CODE_TBL_MAX 0x0005 /* - * AML exceptions. These are caused by problems with + * AML exceptions. These are caused by problems with * the actual AML byte stream */ #define AE_AML_BAD_OPCODE (acpi_status) (0x0001 | AE_CODE_AML) |