diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-13 12:14:05 -0700 |
| commit | 32235b07b52e948900613e27c5cbd955d084ae8a (patch) | |
| tree | 92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/hv/channel_mgmt.c | |
| parent | 59c23eabdae97a18cfc400339138f6d1dbde926a (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
| download | op-kernel-dev-32235b07b52e948900613e27c5cbd955d084ae8a.zip op-kernel-dev-32235b07b52e948900613e27c5cbd955d084ae8a.tar.gz | |
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/channel_mgmt.c')
| -rw-r--r-- | drivers/staging/hv/channel_mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index d084070..fe32f7e 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/drivers/staging/hv/channel_mgmt.c @@ -168,7 +168,7 @@ EXPORT_SYMBOL(prep_negotiate_resp); * from Hyper-V. This stub responds to the default negotiate messages * that come in for every non IDE/SCSI/Network request. * This behavior is normally overwritten in the hv_utils driver. That - * driver handles requests like gracefull shutdown, heartbeats etc. + * driver handles requests like graceful shutdown, heartbeats etc. * * Mainly used by Hyper-V drivers. */ |
