diff options
| author | NeilBrown <neilb@suse.de> | 2010-05-21 22:31:36 (GMT) |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-21 22:31:36 (GMT) |
| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 (patch) | |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 /drivers/net/skfp/ess.c | |
| parent | be6800a73aa2f3dc14744c3b80e676d189789f04 (diff) | |
| parent | 3ff195b011d7decf501a4d55aeed312731094796 (diff) | |
| download | linux-19fdb9eefb21b72edbc365b838502780c392bad6.tar.xz | |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/net/skfp/ess.c')
| -rw-r--r-- | drivers/net/skfp/ess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c index a85efcf..e8387d2 100644 --- a/drivers/net/skfp/ess.c +++ b/drivers/net/skfp/ess.c @@ -557,7 +557,7 @@ static void ess_send_alc_req(struct s_smc *smc) /* * send never allocation request where the requested payload and - * overhead is zero or deallocate bandwidht when no bandwidth is + * overhead is zero or deallocate bandwidth when no bandwidth is * parsed */ if (!smc->mib.fddiESSPayload) { |