diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 00:38:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 00:38:27 -0400 |
| commit | 49dc2b7173010792c6923930ffcee84b7094b7de (patch) | |
| tree | 439899abc82e7413b3bee6d52823d5350d7f2245 /drivers/atm | |
| parent | d66435cc7da95964cb386674bd82ec12ca66320a (diff) | |
| parent | d00cd819d7dfb1a24d814457f47ff4d6c7be152c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
drivers/rtc: broken link fix
drm/i915 Fix typos in i915_gem_fence.c
Docs: fix missing word in REPORTING-BUGS
lib+mm: fix few spelling mistakes
MAINTAINERS: add git URL for APM driver
treewide: Fix typo in printk
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/firestream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 82f2ae0d7cc4..a969a7e443be 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -168,7 +168,7 @@ static char *res_strings[] = { | |||
| 168 | "reserved 14", | 168 | "reserved 14", |
| 169 | "Unrecognized cell", | 169 | "Unrecognized cell", |
| 170 | "reserved 16", | 170 | "reserved 16", |
| 171 | "reassemby abort: AAL5 abort", | 171 | "reassembly abort: AAL5 abort", |
| 172 | "packet purged", | 172 | "packet purged", |
| 173 | "packet ageing timeout", | 173 | "packet ageing timeout", |
| 174 | "channel ageing timeout", | 174 | "channel ageing timeout", |