git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
Documentation
/
networking
/
ifenslave.c
diff --git
a/Documentation/networking/ifenslave.c
b/Documentation/networking/ifenslave.c
index 1b96ccda3836507b18e14a60744b7bfa16de1c83..2bac9618c345722986d160d48da3d735a5b02374 100644
(file)
--- a/
Documentation/networking/ifenslave.c
+++ b/
Documentation/networking/ifenslave.c
@@
-756,7
+756,7
@@
static int enslave(char *master_ifname, char *slave_ifname)
*/
if (abi_ver < 1) {
/* For old ABI, the master needs to be
- * down before setting it
'
s hwaddr
+ * down before setting its hwaddr
*/
res = set_if_down(master_ifname, master_flags.ifr_flags);
if (res) {