A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3.11-rc3 into char-misc-next.

Browse source 
This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2013-07-29 11:50:17 -07:00
commit 9c5891bd43
339 changed files with 6882 additions and 4756 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/hv/hv_kvp_daemon.c
View file

@ -1026,9 +1026,10 @@ kvp_get_ip_info(int family, char *if_name, int op,
if (sn_offset == 0)
strcpy(sn_str, cidr_mask);
else
else {
strcat((char *)ip_buffer->sub_net, ";");
strcat(sn_str, cidr_mask);
strcat((char *)ip_buffer->sub_net, ";");
}
sn_offset += strlen(sn_str) + 1;
}