diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/acpi/apei/ghes.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/acpi/apei/ghes.c')
| -rw-r--r-- | drivers/acpi/apei/ghes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index d1d484d4a06a..f703b2881153 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c | |||
| @@ -241,7 +241,7 @@ static inline int ghes_severity(int severity) | |||
| 241 | case CPER_SEV_FATAL: | 241 | case CPER_SEV_FATAL: |
| 242 | return GHES_SEV_PANIC; | 242 | return GHES_SEV_PANIC; |
| 243 | default: | 243 | default: |
| 244 | /* Unkown, go panic */ | 244 | /* Unknown, go panic */ |
| 245 | return GHES_SEV_PANIC; | 245 | return GHES_SEV_PANIC; |
| 246 | } | 246 | } |
| 247 | } | 247 | } |