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/uwb/reset.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/uwb/reset.c')
| -rw-r--r-- | drivers/uwb/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c index 27849292b552..3de630b0f691 100644 --- a/drivers/uwb/reset.c +++ b/drivers/uwb/reset.c | |||
| @@ -52,7 +52,7 @@ const char *__strerror[] = { | |||
| 52 | "cancelled", | 52 | "cancelled", |
| 53 | "invalid state", | 53 | "invalid state", |
| 54 | "invalid size", | 54 | "invalid size", |
| 55 | "ack not recieved", | 55 | "ack not received", |
| 56 | "no more asie notification", | 56 | "no more asie notification", |
| 57 | }; | 57 | }; |
| 58 | 58 | ||